diff options
-rw-r--r-- | arch/x86/Kconfig | 5 | ||||
-rw-r--r-- | kernel/Kconfig.instrumentation | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 391cb1894127..80b7ba4056db 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -112,8 +112,9 @@ config GENERIC_TIME_VSYSCALL | |||
112 | bool | 112 | bool |
113 | default X86_64 | 113 | default X86_64 |
114 | 114 | ||
115 | 115 | config ARCH_SUPPORTS_OPROFILE | |
116 | 116 | bool | |
117 | default y | ||
117 | 118 | ||
118 | 119 | ||
119 | config ZONE_DMA32 | 120 | config ZONE_DMA32 |
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation index 12a9f74b6267..468f47ad7503 100644 --- a/kernel/Kconfig.instrumentation +++ b/kernel/Kconfig.instrumentation | |||
@@ -20,8 +20,8 @@ config PROFILING | |||
20 | 20 | ||
21 | config OPROFILE | 21 | config OPROFILE |
22 | tristate "OProfile system profiling (EXPERIMENTAL)" | 22 | tristate "OProfile system profiling (EXPERIMENTAL)" |
23 | depends on PROFILING | 23 | depends on PROFILING && !UML |
24 | depends on (ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML | 24 | depends on ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC |
25 | help | 25 | help |
26 | OProfile is a profiling system capable of profiling the | 26 | OProfile is a profiling system capable of profiling the |
27 | whole system, include the kernel, kernel modules, libraries, | 27 | whole system, include the kernel, kernel modules, libraries, |
@@ -31,8 +31,8 @@ config OPROFILE | |||
31 | 31 | ||
32 | config KPROBES | 32 | config KPROBES |
33 | bool "Kprobes" | 33 | bool "Kprobes" |
34 | depends on KALLSYMS && MODULES | 34 | depends on KALLSYMS && MODULES && !UML |
35 | depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML | 35 | depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 |
36 | help | 36 | help |
37 | Kprobes allows you to trap at almost any kernel address and | 37 | Kprobes allows you to trap at almost any kernel address and |
38 | execute a callback function. register_kprobe() establishes | 38 | execute a callback function. register_kprobe() establishes |