Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

[linux-beck.git] / arch / parisc / include / asm / signal.h

diff --git a/arch/parisc/include/asm/signal.h b/arch/parisc/include/asm/signal.h
index b1a7c4c4a53a5d4956cafcca8eb37799b3fa49fa..81a5457739712673d60a210b5b4080fbe91f7381 100644 (file)
--- a/arch/parisc/include/asm/signal.h
+++ b/arch/parisc/include/asm/signal.h
@@ -20,15 +20,13 @@ typedef struct {
        unsigned long sig[_NSIG_WORDS];
 } sigset_t;
 
+#ifndef __KERNEL__
 struct sigaction {
        __sighandler_t sa_handler;
        unsigned long sa_flags;
        sigset_t sa_mask;               /* mask last for extensibility */
 };
-
-struct k_sigaction {
-       struct sigaction sa;
-};
+#endif
 
 #include <asm/sigcontext.h>