diff --git a/[refs] b/[refs] index 1bea49af910c..c9baffb932f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d928b0b616d1c5c5fe76019a87cba171ca91633 +refs/heads/master: d45a398fca6b03f16d01c9253c3a8c96d804f532 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index aef63c8e3d2d..eac1a927ca6e 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -962,18 +962,7 @@ config LOCAL_TIMERS accounting to be spread across the timer interval, preventing a "thundering herd" at every timer tick. -config PREEMPT - bool "Preemptible Kernel (EXPERIMENTAL)" - depends on EXPERIMENTAL - 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 HZ int