Merge with mainline to remove plat-omap/Kconfig conflict

Conflicts:
	arch/arm/plat-omap/Kconfig

1 files changed, 2 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 00b5078da9a3..a0afb555a7c9 100644
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -140,17 +140,15 @@ static int do_signal_pending(sigset_t *oldset, struct pt_regs *regs)
                 return 0;               /* no signals delivered */
         }
 
+#ifndef CONFIG_PPC_ADV_DEBUG_REGS
         /*
          * Reenable the DABR before delivering the signal to
          * user space. The DABR will have been cleared if it
          * triggered inside the kernel.
          */
-        if (current->thread.dabr) {
+        if (current->thread.dabr)
                 set_dabr(current->thread.dabr);
-#if defined(CONFIG_BOOKE)
-                mtspr(SPRN_DBCR0, current->thread.dbcr0);
 #endif
-        }
 
         if (is32) {
                 if (ka.sa.sa_flags & SA_SIGINFO)