Pull percpu-dtc into release branch

[powerpc.git] / arch / avr32 / kernel / kprobes.c

diff --git a/arch/avr32/kernel/kprobes.c b/arch/avr32/kernel/kprobes.c
index 6caf9e8..d0abbca 100644 (file)
--- a/arch/avr32/kernel/kprobes.c
+++ b/arch/avr32/kernel/kprobes.c
@@ -109,7 +109,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs)
        void *addr = (void *)regs->pc;
        int ret = 0;
 
-       pr_debug("kprobe_handler: kprobe_running=%d\n",
+       pr_debug("kprobe_handler: kprobe_running=%p\n",
                 kprobe_running());
 
        /*
@@ -154,6 +154,7 @@ ss_probe:
        return 1;
 
 no_kprobe:
+       preempt_enable_no_resched();
        return ret;
 }