Merge tag 'v3.10.107' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / powerpc / kernel / hw_breakpoint.c

diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c
index f0b47d1a6b0ebd92dddd3ed49275e40a361c72ea..7531f9abf10d05dd0ffb2d7b3cc1f35adb56f84f 100644 (file)
--- a/arch/powerpc/kernel/hw_breakpoint.c
+++ b/arch/powerpc/kernel/hw_breakpoint.c
@@ -228,8 +228,10 @@ int __kprobes hw_breakpoint_handler(struct die_args *args)
        rcu_read_lock();
 
        bp = __get_cpu_var(bp_per_reg);
-       if (!bp)
+       if (!bp) {
+               rc = NOTIFY_DONE;
                goto out;
+       }
        info = counter_arch_bp(bp);
 
        /*