Signed-off-by: Eugene Teo arch/arm/kernel/kprobes-decode.c | 12 ++++++------ arch/arm/kernel/kprobes.c | 11 ++++++----- arch/arm/kernel/traps.c | 6 +++--- include/asm-arm/kprobes.h | 4 ++-- 4 files changed, 17 insertions(+), 16 deletions(-) diff -uprN -X kernel-source-rx-34-2.6.18.default/Documentation/dontdiff kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/kprobes-decode.c kernel-source-rx-34-2.6.18/arch/arm/kernel/kprobes-decode.c --- kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/kprobes-decode.c 2007-07-07 15:03:37.000000000 +0800 +++ kernel-source-rx-34-2.6.18/arch/arm/kernel/kprobes-decode.c 2007-07-07 15:48:36.000000000 +0800 @@ -78,12 +78,12 @@ typedef long (insn_0arg_fn_t)(void); typedef long (insn_1arg_fn_t)(long); -typedef long (insn_2arg_fn_t)(long,long); -typedef long (insn_3arg_fn_t)(long,long,long); -typedef long (insn_4arg_fn_t)(long,long,long,long); +typedef long (insn_2arg_fn_t)(long, long); +typedef long (insn_3arg_fn_t)(long, long, long); +typedef long (insn_4arg_fn_t)(long, long, long, long); typedef long long (insn_llret_0arg_fn_t)(void); -typedef long long (insn_llret_3arg_fn_t)(long,long,long); -typedef long long (insn_llret_4arg_fn_t)(long,long,long,long); +typedef long long (insn_llret_3arg_fn_t)(long, long, long); +typedef long long (insn_llret_4arg_fn_t)(long, long, long, long); typedef union { long long dr; @@ -508,7 +508,7 @@ static void __kprobes simulate_stm1_pc(s return; regs->ARM_pc = (long)p->addr + kprobes_str_pc_offset; - simulate_ldm1stm1(p,regs); + simulate_ldm1stm1(p, regs); regs->ARM_pc = (long)p->addr + 4; } diff -uprN -X kernel-source-rx-34-2.6.18.default/Documentation/dontdiff kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/kprobes.c kernel-source-rx-34-2.6.18/arch/arm/kernel/kprobes.c --- kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/kprobes.c 2007-07-07 15:03:37.000000000 +0800 +++ kernel-source-rx-34-2.6.18/arch/arm/kernel/kprobes.c 2007-07-07 14:40:12.000000000 +0800 @@ -19,12 +19,12 @@ #include #include #include +#include +#include #include #include -#include #include #include -#include #define flush_insns(addr, cnt) \ flush_icache_range((unsigned long)(addr), \ @@ -131,7 +131,8 @@ void __kprobes arch_prepare_kretprobe(st { struct kretprobe_instance *ri; - if ((ri = get_free_rp_inst(rp)) != NULL) { + ri = get_free_rp_inst(rp); + if (ri != NULL) { ri->rp = rp; ri->task = current; ri->ret_addr = (kprobe_opcode_t *)regs->ARM_lr; @@ -367,13 +368,13 @@ void __attribute__((naked)) __kprobes kr /* * Called from kretprobe_trampoline_holder */ -void * __kprobes trampoline_handler(struct pt_regs *regs) +void *__kprobes trampoline_handler(struct pt_regs *regs) { struct kretprobe_instance *ri = NULL; struct hlist_head *head, empty_rp; struct hlist_node *node, *tmp; unsigned long flags, orig_ret_address = 0; - unsigned long trampoline_address =(unsigned long)&kretprobe_trampoline; + unsigned long trampoline_address = (unsigned long)&kretprobe_trampoline; INIT_HLIST_HEAD(&empty_rp); spin_lock_irqsave(&kretprobe_lock, flags); diff -uprN -X kernel-source-rx-34-2.6.18.default/Documentation/dontdiff kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/traps.c kernel-source-rx-34-2.6.18/arch/arm/kernel/traps.c --- kernel-source-rx-34-2.6.18.patched/arch/arm/kernel/traps.c 2007-07-07 15:03:37.000000000 +0800 +++ kernel-source-rx-34-2.6.18/arch/arm/kernel/traps.c 2007-07-07 14:40:27.000000000 +0800 @@ -289,9 +289,9 @@ asmlinkage void __kprobes do_undefinstr( regs->ARM_pc -= correction; #ifdef CONFIG_KPROBES - /* - * Redirect kernel mode undef exceptions to kprobes. - */ + /* + * Redirect kernel mode undef exceptions to kprobes. + */ if (!user_mode(regs) && !thumb_mode(regs)) { if ( (*(unsigned long *)regs->ARM_pc == KPROBE_BREAKPOINT_INSTRUCTION) && diff -uprN -X kernel-source-rx-34-2.6.18.default/Documentation/dontdiff kernel-source-rx-34-2.6.18.patched/include/asm-arm/kprobes.h kernel-source-rx-34-2.6.18/include/asm-arm/kprobes.h --- kernel-source-rx-34-2.6.18.patched/include/asm-arm/kprobes.h 2007-07-07 15:03:37.000000000 +0800 +++ kernel-source-rx-34-2.6.18/include/asm-arm/kprobes.h 2007-07-07 14:45:13.000000000 +0800 @@ -75,10 +75,10 @@ struct kprobe_ctlblk { extern void arch_flush_insn_slot(struct kprobe *); extern int kprobe_exceptions_notify(struct notifier_block *self, - unsigned long val, void *data); + unsigned long val, void *data); extern void arch_remove_kprobe(struct kprobe *); extern enum kprobe_insn kprobe_decode_insn(kprobe_opcode_t, - struct arch_specific_insn *); + struct arch_specific_insn *); extern int kprobe_handler(struct pt_regs *regs); #endif /* _ARM_KPROBES_H */