diff --git a/[refs] b/[refs] index 2f25d853ab80..757cc77fe792 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a3f61dc0a5335334958ec3b97d0b1946b4ae5375 +refs/heads/master: 0edc4ffd0e50d1ab0f387d37457210bc8bf8f8da diff --git a/trunk/arch/powerpc/kernel/signal.c b/trunk/arch/powerpc/kernel/signal.c index dee275014e00..88d8977731ed 100644 --- a/trunk/arch/powerpc/kernel/signal.c +++ b/trunk/arch/powerpc/kernel/signal.c @@ -146,7 +146,6 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) return 0; /* no signals delivered */ } -#ifdef CONFIG_PPC64 /* * Reenable the DABR before delivering the signal to * user space. The DABR will have been cleared if it @@ -154,7 +153,6 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs) */ if (current->thread.dabr) set_dabr(current->thread.dabr); -#endif if (is32) { if (ka.sa.sa_flags & SA_SIGINFO)