diff --git a/[refs] b/[refs] index fed72cb2720c..a2195e51022d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1379a5ce3ffc549a7ff3daffc49c5e1c372717a3 +refs/heads/master: 1017579a8c6ad6f32154e41ddfdf96d1efbb21b4 diff --git a/trunk/arch/x86/kernel/kprobes.c b/trunk/arch/x86/kernel/kprobes.c index 53ba6a5b6550..93aff49798ee 100644 --- a/trunk/arch/x86/kernel/kprobes.c +++ b/trunk/arch/x86/kernel/kprobes.c @@ -583,8 +583,8 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) * When a retprobed function returns, this code saves registers and * calls trampoline_handler() runs, which calls the kretprobe's handler. */ - void __kprobes kretprobe_trampoline_holder(void) - { +void __kprobes kretprobe_trampoline_holder(void) +{ asm volatile ( ".global kretprobe_trampoline\n" "kretprobe_trampoline: \n" @@ -670,7 +670,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) " popf\n" #endif " ret\n"); - } +} /* * Called from kretprobe_trampoline