aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-10-17 02:27:31 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:55 -0400
commite98c3202916d30f0e6f59735801baa69bc3348ac (patch)
tree6e405583a9c6f302f90e6be3247ba30e85c34582
parent328dfd0f78136082d32d5663d08b514ecba91e68 (diff)
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 <zippel@linux-m68k.org> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Avi Kivity <avi@qumranet.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--init/Kconfig3
-rw-r--r--kernel/Kconfig.preempt3
2 files changed, 3 insertions, 3 deletions
diff --git a/init/Kconfig b/init/Kconfig
index 54f31a191b88..a29a688c47d3 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -689,3 +689,6 @@ config STOP_MACHINE
689 Need stop_machine() primitive. 689 Need stop_machine() primitive.
690 690
691source "block/Kconfig" 691source "block/Kconfig"
692
693config PREEMPT_NOTIFIERS
694 bool
diff --git a/kernel/Kconfig.preempt b/kernel/Kconfig.preempt
index 6b066632e40c..c64ce9c14207 100644
--- a/kernel/Kconfig.preempt
+++ b/kernel/Kconfig.preempt
@@ -63,6 +63,3 @@ config PREEMPT_BKL
63 Say Y here if you are building a kernel for a desktop system. 63 Say Y here if you are building a kernel for a desktop system.
64 Say N if you are unsure. 64 Say N if you are unsure.
65 65
66config PREEMPT_NOTIFIERS
67 bool
68