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

[karo-tx-linux.git] / include / linux / compat.h

diff --git a/include/linux/compat.h b/include/linux/compat.h
index 2bfe67329dc49f84ba8412227ca288c2ed2aa8bf..d53c35352ea9d14aa4a9c974fa559ab95f88e187 100644 (file)
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
@@ -126,11 +126,11 @@ typedef struct {
 } compat_sigset_t;
 
 struct compat_sigaction {
-#ifndef __ARCH_HAS_ODD_SIGACTION
+#ifndef __ARCH_HAS_IRIX_SIGACTION
        compat_uptr_t                   sa_handler;
        compat_ulong_t                  sa_flags;
 #else
-       compat_ulong_t                  sa_flags;
+       compat_uint_t                   sa_flags;
        compat_uptr_t                   sa_handler;
 #endif
 #ifdef __ARCH_HAS_SA_RESTORER