diff options
| -rw-r--r-- | arch/arm/kernel/kprobes.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/kprobes.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/kernel/kprobes.c b/arch/arm/kernel/kprobes.c index 5593dd207216..5ee39e10c8d1 100644 --- a/arch/arm/kernel/kprobes.c +++ b/arch/arm/kernel/kprobes.c | |||
| @@ -274,7 +274,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, | |||
| 274 | * for kretprobe handlers which should normally be interested in r0 only | 274 | * for kretprobe handlers which should normally be interested in r0 only |
| 275 | * anyway. | 275 | * anyway. |
| 276 | */ | 276 | */ |
| 277 | static void __attribute__((naked)) __kprobes kretprobe_trampoline(void) | 277 | void __naked __kprobes kretprobe_trampoline(void) |
| 278 | { | 278 | { |
| 279 | __asm__ __volatile__ ( | 279 | __asm__ __volatile__ ( |
| 280 | "stmdb sp!, {r0 - r11} \n\t" | 280 | "stmdb sp!, {r0 - r11} \n\t" |
diff --git a/include/asm-arm/kprobes.h b/include/asm-arm/kprobes.h index c042194d3ab5..b1a37876942d 100644 --- a/include/asm-arm/kprobes.h +++ b/include/asm-arm/kprobes.h | |||
| @@ -59,6 +59,7 @@ struct kprobe_ctlblk { | |||
| 59 | }; | 59 | }; |
| 60 | 60 | ||
| 61 | void arch_remove_kprobe(struct kprobe *); | 61 | void arch_remove_kprobe(struct kprobe *); |
| 62 | void kretprobe_trampoline(void); | ||
| 62 | 63 | ||
| 63 | int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr); | 64 | int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr); |
| 64 | int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); | 65 | int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr); |
