diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 09:41:12 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-06 09:41:12 -0800 |
| commit | 3743d33edf4e49376384822c57c4ee5cdf2d32f8 (patch) | |
| tree | 75241a77262048fa96689f1beb7298435804f200 | |
| parent | 00a5825332769706eb2e276c101dd20269a53992 (diff) | |
Tiny clean-up of OPROFILE/KPROBES configuration
Make the Kconfig.instrumentation file a bit easier on the eyes, and use
the new ARCH_SUPPORTS_OPROFILE for x86[-64].
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -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 391cb189412..80b7ba4056d 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -112,8 +112,9 @@ config GENERIC_TIME_VSYSCALL bool default X86_64 - - +config ARCH_SUPPORTS_OPROFILE + bool + default y config ZONE_DMA32 diff --git a/kernel/Kconfig.instrumentation b/kernel/Kconfig.instrumentation index 12a9f74b626..468f47ad750 100644 --- a/kernel/Kconfig.instrumentation +++ b/kernel/Kconfig.instrumentation @@ -20,8 +20,8 @@ config PROFILING config OPROFILE tristate "OProfile system profiling (EXPERIMENTAL)" - depends on PROFILING - depends on (ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || X86_32 || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC || X86_64) && !UML + depends on PROFILING && !UML + depends on ARCH_SUPPORTS_OPROFILE || ALPHA || ARM || BLACKFIN || IA64 || M32R || PARISC || PPC || S390 || SUPERH || SPARC help OProfile is a profiling system capable of profiling the whole system, include the kernel, kernel modules, libraries, @@ -31,8 +31,8 @@ config OPROFILE config KPROBES bool "Kprobes" - depends on KALLSYMS && MODULES - depends on (X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32) && !UML + depends on KALLSYMS && MODULES && !UML + depends on X86_32 || IA64 || PPC || S390 || SPARC64 || X86_64 || AVR32 help Kprobes allows you to trap at almost any kernel address and execute a callback function. register_kprobe() establishes |