Skip to content

Commit

Permalink
Revert "kernel: Enable interrupts for MULTITHREADING=n on supported a…
Browse files Browse the repository at this point in the history
…rch'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 zephyrproject-rtos#9808

Signed-off-by: Anas Nashif <anas.nashif@intel.com>
  • Loading branch information
nashif authored and Josh0027 committed Sep 10, 2018
1 parent e9e59ce commit 88a620d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 18 deletions.
2 changes: 0 additions & 2 deletions include/arch/arm/cortex_m/asm_inline_gcc.h
Expand Up @@ -175,8 +175,6 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
#endif /* CONFIG_ARMV6_M_ARMV8_M_BASELINE */
}

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

#endif /* _ASMLANGUAGE */

Expand Down
3 changes: 0 additions & 3 deletions include/arch/x86/arch.h
Expand Up @@ -445,9 +445,6 @@ static ALWAYS_INLINE void _arch_irq_unlock(unsigned int key)
_do_irq_unlock();
}

/* Used to unconditionally enable interrupts when MULTITHREADING=n */
#define Z_ARCH_INT_ENABLE() _arch_irq_unlock(0x200)

/**
* The NANO_SOFT_IRQ macro must be used as the value for the @a irq parameter
* to NANO_CPU_INT_REGISTER when connecting to an interrupt that does not
Expand Down
13 changes: 0 additions & 13 deletions kernel/init.c
Expand Up @@ -436,18 +436,6 @@ u32_t z_early_boot_rand32_get(void)
extern uintptr_t __stack_chk_guard;
#endif /* CONFIG_STACK_CANARIES */

#ifndef CONFIG_MULTITHREADING
static void enable_interrupts(void)
{
#ifdef Z_ARCH_INT_ENABLE
Z_ARCH_INT_ENABLE();
#else
# pragma message "Z_ARCH_INT_ENABLE not defined for this architecture."
# pragma message "Entry to MULTITHREADING=n app code will be with interrupts disabled."
#endif
}
#endif

/**
*
* @brief Initialize kernel
Expand Down Expand Up @@ -502,7 +490,6 @@ FUNC_NORETURN void _Cstart(void)
prepare_multithreading(dummy_thread);
switch_to_main_thread();
#else
enable_interrupts();
bg_thread_main(NULL, NULL, NULL);

irq_lock();
Expand Down

0 comments on commit 88a620d

Please sign in to comment.