[POWERPC] Less ifdef's in signal.c/signal.h

This patch moves things around a little bit in the new common signal.c
and signal.h files to remove the last #ifdef in the middle of the
common do_signal().

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/kernel/signal.c b/arch/powerpc/kernel/signal.c
index 88d8977731ed6e5dbb73f2adc1549e81a56bb773..c434d6c4e4e6c5d9577deb44a66d00887403bb2d 100644 (file)
--- a/arch/powerpc/kernel/signal.c
+++ b/arch/powerpc/kernel/signal.c
@@ -16,19 +16,6 @@
 
 #include "signal.h"
 
-
-#ifdef CONFIG_PPC64
-static inline int is_32bit_task(void)
-{
-       return test_thread_flag(TIF_32BIT);
-}
-#else
-static inline int is_32bit_task(void)
-{
-       return 1;
-}
-#endif
-
 /*
  * Allocate space for the signal frame
  */
@@ -161,10 +148,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
                else
                        ret = handle_signal32(signr, &ka, &info, oldset,
                                        regs);
-#ifdef CONFIG_PPC64
        } else {
                ret = handle_rt_signal64(signr, &ka, &info, oldset, regs);
-#endif
        }
 
        if (ret) {

diff --git a/arch/powerpc/kernel/signal.h b/arch/powerpc/kernel/signal.h
index c284f75afe77d0f1519cf8cbc3f71df2add69516..77efb3d5465a1c95793b9386b86ea1952ecbb21d 100644 (file)
--- a/arch/powerpc/kernel/signal.h
+++ b/arch/powerpc/kernel/signal.h
@@ -24,8 +24,32 @@ extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
                              siginfo_t *info, sigset_t *oldset,
                              struct pt_regs *regs);
 
+
+#ifdef CONFIG_PPC64
+
+static inline int is_32bit_task(void)
+{
+       return test_thread_flag(TIF_32BIT);
+}
+
 extern int handle_rt_signal64(int signr, struct k_sigaction *ka,
                              siginfo_t *info, sigset_t *set,
                              struct pt_regs *regs);
 
+#else /* CONFIG_PPC64 */
+
+static inline int is_32bit_task(void)
+{
+       return 1;
+}
+
+static inline int handle_rt_signal64(int signr, struct k_sigaction *ka,
+                                    siginfo_t *info, sigset_t *set,
+                                    struct pt_regs *regs)
+{
+       return -EFAULT;
+}
+
+#endif /* !defined(CONFIG_PPC64) */
+
 #endif  /* _POWERPC_ARCH_SIGNAL_H */