From 82828cd8098d626732350e4ee6d87d71c612ac14 Mon Sep 17 00:00:00 2001 From: Abhishek Sagar Date: Sat, 31 May 2008 14:24:02 +0530 Subject: [PATCH] --- yaml --- r: 100568 b: refs/heads/master c: e0773410247f1e5fc6f7c52a4c5f3c6c9873d527 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/kprobes.c | 2 +- trunk/include/asm-arm/kprobes.h | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fbfc31d03a88..a6b68d2c29c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad90c0e3ce8d20d6873b57e36181ef6d7a0097fe +refs/heads/master: e0773410247f1e5fc6f7c52a4c5f3c6c9873d527 diff --git a/trunk/arch/arm/kernel/kprobes.c b/trunk/arch/arm/kernel/kprobes.c index 5593dd207216..5ee39e10c8d1 100644 --- a/trunk/arch/arm/kernel/kprobes.c +++ b/trunk/arch/arm/kernel/kprobes.c @@ -274,7 +274,7 @@ int __kprobes kprobe_exceptions_notify(struct notifier_block *self, * for kretprobe handlers which should normally be interested in r0 only * anyway. */ -static void __attribute__((naked)) __kprobes kretprobe_trampoline(void) +void __naked __kprobes kretprobe_trampoline(void) { __asm__ __volatile__ ( "stmdb sp!, {r0 - r11} \n\t" diff --git a/trunk/include/asm-arm/kprobes.h b/trunk/include/asm-arm/kprobes.h index c042194d3ab5..b1a37876942d 100644 --- a/trunk/include/asm-arm/kprobes.h +++ b/trunk/include/asm-arm/kprobes.h @@ -59,6 +59,7 @@ struct kprobe_ctlblk { }; void arch_remove_kprobe(struct kprobe *); +void kretprobe_trampoline(void); int kprobe_trap_handler(struct pt_regs *regs, unsigned int instr); int kprobe_fault_handler(struct pt_regs *regs, unsigned int fsr);