path: root/arch/avr32/include
diff options
authorLuis R. Rodriguez <>2017-02-27 14:26:56 -0800
committerLinus Torvalds <>2017-02-27 18:43:45 -0800
commit7d134b2ce639448199052fd573a324f7e7cd5ed8 (patch)
treef74f213947573489c165ae74a0d7bbf27abf0b90 /arch/avr32/include
parentfd5bb66cd934987e49557455b6497fc006521940 (diff)
kprobes: move kprobe declarations to asm-generic/kprobes.h
Often all is needed is these small helpers, instead of compiler.h or a full kprobes.h. This is important for asm helpers, in fact even some asm/kprobes.h make use of these helpers... instead just keep a generic asm file with helpers useful for asm code with the least amount of clutter as possible. Likewise we need now to also address what to do about this file for both when architectures have CONFIG_HAVE_KPROBES, and when they do not. Then for when architectures have CONFIG_HAVE_KPROBES but have disabled CONFIG_KPROBES. Right now most asm/kprobes.h do not have guards against CONFIG_KPROBES, this means most architecture code cannot include asm/kprobes.h safely. Correct this and add guards for architectures missing them. Additionally provide architectures that not have kprobes support with the default asm-generic solution. This lets us force asm/kprobes.h on the header include/linux/kprobes.h always, but most importantly we can now safely include just asm/kprobes.h on architecture code without bringing the full kitchen sink of header files. Two architectures already provided a guard against CONFIG_KPROBES on its kprobes.h: sh, arch. The rest of the architectures needed gaurds added. We avoid including any not-needed headers on asm/kprobes.h unless kprobes have been enabled. In a subsequent atomic change we can try now to remove compiler.h from include/linux/kprobes.h. During this sweep I've also identified a few architectures defining a common macro needed for both kprobes and ftrace, that of the definition of the breakput instruction up. Some refer to this as BREAKPOINT_INSTRUCTION. This must be kept outside of the #ifdef CONFIG_KPROBES guard. [ fix arm64 build] Link: [ fixup for kprobes declarations moving] Link: Link: Signed-off-by: Luis R. Rodriguez <> Signed-off-by: Stephen Rothwell <> Acked-by: Masami Hiramatsu <> Cc: Arnd Bergmann <> Cc: Masami Hiramatsu <> Cc: Ananth N Mavinakayanahalli <> Cc: Anil S Keshavamurthy <> Cc: David S. Miller <> Cc: Ingo Molnar <> Cc: Thomas Gleixner <> Cc: H. Peter Anvin <> Cc: Andy Lutomirski <> Cc: Steven Rostedt <> Signed-off-by: Andrew Morton <> Signed-off-by: Linus Torvalds <>
Diffstat (limited to 'arch/avr32/include')
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/kprobes.h b/arch/avr32/include/asm/kprobes.h
index 45f563e..28dfc61a 100644
--- a/arch/avr32/include/asm/kprobes.h
+++ b/arch/avr32/include/asm/kprobes.h
@@ -11,10 +11,14 @@
#ifndef __ASM_AVR32_KPROBES_H
#define __ASM_AVR32_KPROBES_H
+#include <asm-generic/kprobes.h>
+#define BREAKPOINT_INSTRUCTION 0xd673 /* breakpoint */
#include <linux/types.h>
typedef u16 kprobe_opcode_t;
-#define BREAKPOINT_INSTRUCTION 0xd673 /* breakpoint */
#define MAX_INSN_SIZE 2
#define MAX_STACK_SIZE 64 /* 32 would probably be OK */
@@ -46,4 +50,5 @@ extern int kprobe_exceptions_notify(struct notifier_block *self,
#define flush_insn_slot(p) do { } while (0)
+#endif /* CONFIG_KPROBES */
#endif /* __ASM_AVR32_KPROBES_H */