Skip to content

Commit 6b6ecc0

Browse files
committed
Revert "kernel: Enable interrupts for MULTITHREADING=n on supported arch's"
This reverts commit 17e9d62. Single thread keep introducing more issues, decided to remove the feature completely and push any required changes for after 1.13. See #9808 Signed-off-by: Anas Nashif <[email protected]>
1 parent 3d246c0 commit 6b6ecc0

File tree

3 files changed

+0
-18
lines changed

3 files changed

+0
-18
lines changed

include/arch/arm/cortex_m/asm_inline_gcc.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,6 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
175175
#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
176176
}
177177

178-
/* Used to unconditionally enable interrupts when MULTITHREADING=n */
179-
#define Z_ARCH_INT_ENABLE() _arch_irq_unlock(0)
180178

181179
#endif /* _ASMLANGUAGE */
182180

include/arch/x86/arch.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,9 +445,6 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
445445
_do_irq_unlock();
446446
}
447447

448-
/* Used to unconditionally enable interrupts when MULTITHREADING=n */
449-
#define Z_ARCH_INT_ENABLE() _arch_irq_unlock(0x200)
450-
451448
/**
452449
* The NANO_SOFT_IRQ macro must be used as the value for the @a irq parameter
453450
* to NANO_CPU_INT_REGISTER when connecting to an interrupt that does not

kernel/init.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -436,18 +436,6 @@ u32_t z_early_boot_rand32_get(void)
436436
extern uintptr_t __stack_chk_guard;
437437
#endif /* CONFIG_STACK_CANARIES */
438438

439-
#ifndef CONFIG_MULTITHREADING
440-
static void enable_interrupts(void)
441-
{
442-
#ifdef Z_ARCH_INT_ENABLE
443-
Z_ARCH_INT_ENABLE();
444-
#else
445-
# pragma message "Z_ARCH_INT_ENABLE not defined for this architecture."
446-
# pragma message "Entry to MULTITHREADING=n app code will be with interrupts disabled."
447-
#endif
448-
}
449-
#endif
450-
451439
/**
452440
*
453441
* @brief Initialize kernel
@@ -502,7 +490,6 @@ FUNC_NORETURN void _Cstart(void)
502490
prepare_multithreading(dummy_thread);
503491
switch_to_main_thread();
504492
#else
505-
enable_interrupts();
506493
bg_thread_main(NULL, NULL, NULL);
507494

508495
irq_lock();

0 commit comments

Comments
 (0)