From: Avi Kivity Date: Wed, 17 Oct 2007 06:27:31 +0000 (-0700) Subject: Move PREEMPT_NOTIFIERS into an always-included Kconfig X-Git-Tag: v2.6.24-rc1~661 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e98c3202916d30f0e6f59735801baa69bc3348ac;p=linux-2.6 Move PREEMPT_NOTIFIERS into an always-included Kconfig Kconfig.preempt is not included on some archs (for example, m68k). On those archs, the Kconfig machinery complains that KVM selects an undefined symbol PREEMPT_NOTIFIERS (which lives in Kconfig.preempt). So move the offending symbol into a Kconfig file which is included by everyone. Cc: Roman Zippel Cc: Geert Uytterhoeven Signed-off-by: Avi Kivity Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/init/Kconfig b/init/Kconfig index 54f31a191b..a29a688c47 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -689,3 +689,6 @@ config STOP_MACHINE Need stop_machine() primitive. source "block/Kconfig" + +config PREEMPT_NOTIFIERS + bool diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt index 6b066632e4..c64ce9c142 100644 --- a/kernel/Kconfig.preempt +++ b/kernel/Kconfig.preempt @@ -63,6 +63,3 @@ config PREEMPT_BKL Say Y here if you are building a kernel for a desktop system. Say N if you are unsure. -config PREEMPT_NOTIFIERS - bool -