aboutsummaryrefslogtreecommitdiff
path: root/kernel/Kconfig.instrumentation
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2007-12-01 12:16:29 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-12-03 08:13:17 -0800
commitb00296fb781acfafa93687000cdef72b8922bb40 (patch)
tree5efd31cbfd4457f875e3f0a6becc864e643d7d03 /kernel/Kconfig.instrumentation
parent54d67ee22c1ed12ff595defdf89e3d07b430497d (diff)
uml: add !UML dependencies
The previous commit ("uml: keep UML Kconfig in sync with x86") is not enough, unfortunately. If we go that way, we need to add dependencies on !UML for several options. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Dike <jdike@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/Kconfig.instrumentation')
-rw-r--r--kernel/Kconfig.instrumentation4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation
index f5f2c769d95..2ea1e347df4 100644
--- a/kernel/Kconfig.instrumentation
+++ b/kernel/Kconfig.instrumentation
@@ -21,7 +21,7 @@ config PROFILING
config OPROFILE
tristate "OProfile system profiling (EXPERIMENTAL)"
depends on PROFILING
- depends on ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64
+ depends on (ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML
help
OProfile is a profiling system capable of profiling the
whole system, include the kernel, kernel modules, libraries,
@@ -32,7 +32,7 @@ config OPROFILE
config KPROBES
bool "Kprobes"
depends on KALLSYMS && MODULES
- depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32
+ depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML
help
Kprobes allows you to trap at almost any kernel address and
execute a callback function. register_kprobe() establishes