diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-09-22 18:45:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-09-22 18:45:01 +0200 |
| commit | 90edf27fb89241917e91155bfdcc7c8e5a587222 (patch) | |
| tree | a2d1841cfe382f426a3b6ccb306b0665ad455885 /arch/Kconfig | |
| parent | 41945f6ccf1e86f87fddf6b32db9cf431c05fb54 (diff) | |
| parent | 8b15575cae7a93a784c3005c42b069edd9ba64dd (diff) | |
| download | op-kernel-dev-90edf27fb89241917e91155bfdcc7c8e5a587222.zip op-kernel-dev-90edf27fb89241917e91155bfdcc7c8e5a587222.tar.gz | |
Merge branch 'linus' into perf/core
Conflicts:
kernel/hw_breakpoint.c
Merge reason: resolve the conflict.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/Kconfig')
| -rw-r--r-- | arch/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/Kconfig b/arch/Kconfig index 4877a8c..fe48fc7 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -32,8 +32,9 @@ config HAVE_OPROFILE config KPROBES bool "Kprobes" - depends on KALLSYMS && MODULES + depends on MODULES depends on HAVE_KPROBES + select KALLSYMS help Kprobes allows you to trap at almost any kernel address and execute a callback function. register_kprobe() establishes @@ -45,7 +46,6 @@ config OPTPROBES def_bool y depends on KPROBES && HAVE_OPTPROBES depends on !PREEMPT - select KALLSYMS_ALL config HAVE_EFFICIENT_UNALIGNED_ACCESS bool |
