From dab16ae1a9fc72a9f419f2dff91854e452d02a5e Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 5 Jul 2011 16:29:40 +0200 Subject: m32r: Use generic PREEMPT config Use the generic preempt config definition in m32r instead of using a custom one. This also makes it handle the new CONFIG_PREEMPT_COUNT that need to be selected by CONFIG_PREEMPT. Without that it breaks kernel/sched.c: In function 'preempt_schedule': kernel/sched.c:4364: error: implicit declaration of function 'add_preempt_count_notrace' kernel/sched.c:4366: error: implicit declaration of function 'sub_preempt_count_notrace' Reported-by: Ingo Molnar Signed-off-by: Frederic Weisbecker Cc: Hirokazu Takata --- arch/m32r/Kconfig | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) (limited to 'arch') diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig index 85b44e858225..b92b9445255d 100644 --- a/arch/m32r/Kconfig +++ b/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" -- cgit v1.2.3-58-ga151 From e22c8f4616c8e68b7659331409e9c081ce265498 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 5 Jul 2011 17:45:34 +0200 Subject: h8300: Use generic config PREEMPT definition So that it can handle the new CONFIG_PREEMPT_COUNT. Signed-off-by: Frederic Weisbecker Cc: Yoshinori Sato --- arch/h8300/Kconfig.cpu | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'arch') diff --git a/arch/h8300/Kconfig.cpu b/arch/h8300/Kconfig.cpu index d236ab4232ca..15c22286ae79 100644 --- a/arch/h8300/Kconfig.cpu +++ b/arch/h8300/Kconfig.cpu @@ -162,9 +162,7 @@ config H8300_TPU_CH int "TPU channel" depends on H8300_TPU -config PREEMPT - bool "Preemptible Kernel" - default n +source "kernel/Kconfig.preempt" source "mm/Kconfig" -- cgit v1.2.3-58-ga151 From bd96efe17d945f0bad56d592f8686dc6309905e7 Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 5 Jul 2011 17:45:34 +0200 Subject: xtensa: Use generic config PREEMPT definition So that it can handle the new CONFIG_PREEMPT_COUNT. Signed-off-by: Frederic Weisbecker Cc: Chris Zankel --- arch/xtensa/Kconfig | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'arch') diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig index 5d43c1f8ada8..c346ccdce0df 100644 --- a/arch/xtensa/Kconfig +++ b/arch/xtensa/Kconfig @@ -80,18 +80,7 @@ config XTENSA_UNALIGNED_USER Say Y here to enable unaligned memory access in user space. -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. - Unfortunately the kernel code has some race conditions if both - CONFIG_SMP and CONFIG_PREEMPT are enabled, so this option is - currently disabled if you are building an SMP kernel. - - 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 MATH_EMULATION bool "Math emulation" -- cgit v1.2.3-58-ga151