diff --git a/[refs] b/[refs] index bab430a9451e..22743328f063 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 60080265a13ea43f0ebdcd25671dcab05ed01308 +refs/heads/master: e80de8503cbcaecd7637fde26635dbc825f796dd diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig index a4c62c72aa89..68c30288849a 100644 --- a/trunk/arch/mips/Kconfig +++ b/trunk/arch/mips/Kconfig @@ -1370,14 +1370,7 @@ config NR_CPUS This is purely to save memory - each supported CPU adds approximately eight kilobytes to the kernel image. -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. +source "kernel/Kconfig.preempt" config RTC_DS1742 bool "DS1742 BRAM/RTC support"