1 files changed, 6 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index e4883ae36277..266610119f66 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -1092,8 +1092,12 @@ int sys_debug_setcontext(struct ucontext __user *ctx,
                                 new_msr |= MSR_DE;
                                 new_dbcr0 |= (DBCR0_IDM | DBCR0_IC);
                         } else {
-                                new_msr &= ~MSR_DE;
-                                new_dbcr0 &= ~(DBCR0_IDM | DBCR0_IC);
+                                new_dbcr0 &= ~DBCR0_IC;
+                                if (!DBCR_ACTIVE_EVENTS(new_dbcr0,
+                                                current->thread.dbcr1)) {
+                                        new_msr &= ~MSR_DE;
+                                        new_dbcr0 &= ~DBCR0_IDM;
+                                }
                         }
 #else
                         if (op.dbg_value)