Merge branch 'perf/kprobes' into perf/core

Conflicts:
	arch/x86/kernel/traps.c

The kprobes enhancements are fully cooked, ship them upstream.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 10 insertions, 0 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 146e4fffd710..8e0204a68c74 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -109,6 +109,15 @@
 #define BRANCH_PROFILE()
 #endif
 
+#ifdef CONFIG_KPROBES
+#define KPROBE_BLACKLIST()      . = ALIGN(8);                                 \
+                                VMLINUX_SYMBOL(__start_kprobe_blacklist) = .; \
+                                *(_kprobe_blacklist)                          \
+                                VMLINUX_SYMBOL(__stop_kprobe_blacklist) = .;
+#else
+#define KPROBE_BLACKLIST()
+#endif
+
 #ifdef CONFIG_EVENT_TRACING
 #define FTRACE_EVENTS() . = ALIGN(8);                                   \
                         VMLINUX_SYMBOL(__start_ftrace_events) = .;      \
@@ -507,6 +516,7 @@
         *(.init.rodata)                                                 \
         FTRACE_EVENTS()                                                 \
         TRACE_SYSCALLS()                                                \
+        KPROBE_BLACKLIST()                                              \
         MEM_DISCARD(init.rodata)                                        \
         CLK_OF_TABLES()                                                 \
         RESERVEDMEM_OF_TABLES()                                         \