diff --git a/[refs] b/[refs] index 3b8d0413e4cc..cde1f484432d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ecc818c51b1f6886825dae3885792d5e49ec798 +refs/heads/master: dab16ae1a9fc72a9f419f2dff91854e452d02a5e diff --git a/trunk/arch/m32r/Kconfig b/trunk/arch/m32r/Kconfig index 85b44e858225..b92b9445255d 100644 --- a/trunk/arch/m32r/Kconfig +++ b/trunk/arch/m32r/Kconfig @@ -268,17 +268,7 @@ config SCHED_OMIT_FRAME_POINTER bool default y -config PREEMPT - bool "Preemptible Kernel" - help - This option reduces the latency of the kernel when reacting to - real-time or interactive events by allowing a low priority process to - be preempted even if it is in kernel mode executing a system call. - This allows applications to run more reliably even when the system is - under load. - - Say Y here if you are building a kernel for a desktop, embedded - or real-time system. Say N if you are unsure. +source "kernel/Kconfig.preempt" config SMP bool "Symmetric multi-processing support"