diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-09 23:41:22 -0500 |
| commit | b242a60206881559bb3102110048762422e6b74e (patch) | |
| tree | 86459efa47b9c3f69d865b4495beede9c4184003 /kernel/Kconfig.instrumentation | |
| parent | e1fd18656c2963e383d67b7006c0e06c9c1d9c79 (diff) | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'kernel/Kconfig.instrumentation')
| -rw-r--r-- | kernel/Kconfig.instrumentation | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation index f5f2c769d95e..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 ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || MIPS || PARISC || PPC || S390 || SUPERH || SPARC || X86_64 | 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,7 +31,7 @@ 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 | 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 |