signal: Remove _sys_private and _overrun_incr from struct compat_siginfo

We have never passed either field to or from userspace so just remove them.

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>

diff --git a/arch/arm64/include/asm/compat.h b/arch/arm64/include/asm/compat.h
index a3c7f27..dd32fe1 100644 (file)
--- a/arch/arm64/include/asm/compat.h
+++ b/arch/arm64/include/asm/compat.h
@@ -174,7 +174,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;    /* timer id */
                        int _overrun;           /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/parisc/include/asm/compat.h b/arch/parisc/include/asm/compat.h
index acf8aa0..cf3bcac 100644 (file)
--- a/arch/parisc/include/asm/compat.h
+++ b/arch/parisc/include/asm/compat.h
@@ -155,7 +155,6 @@ typedef struct compat_siginfo {
                        int _overrun;           /* overrun count */
                        char _pad[sizeof(unsigned int) - sizeof(int)];
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/powerpc/include/asm/compat.h b/arch/powerpc/include/asm/compat.h
index 8a2aecf..e02de2f 100644 (file)
--- a/arch/powerpc/include/asm/compat.h
+++ b/arch/powerpc/include/asm/compat.h
@@ -145,7 +145,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;            /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/s390/include/asm/compat.h b/arch/s390/include/asm/compat.h
index 5e6a636..3a187c4 100644 (file)
--- a/arch/s390/include/asm/compat.h
+++ b/arch/s390/include/asm/compat.h
@@ -213,7 +213,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;            /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/sparc/include/asm/compat.h b/arch/sparc/include/asm/compat.h
index fa38c78..2d9f4fd 100644 (file)
--- a/arch/sparc/include/asm/compat.h
+++ b/arch/sparc/include/asm/compat.h
@@ -175,7 +175,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;            /* timer id */
                        int _overrun;                   /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/tile/include/asm/compat.h b/arch/tile/include/asm/compat.h
index 62a7b83..59ab9fa 100644 (file)
--- a/arch/tile/include/asm/compat.h
+++ b/arch/tile/include/asm/compat.h
@@ -136,8 +136,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;    /* timer id */
                        int _overrun;           /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
-                       int _overrun_incr;      /* amount to add to overrun */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index 2cbd75d..1b6886a 100644 (file)
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@ -151,8 +151,6 @@ typedef struct compat_siginfo {
                        compat_timer_t _tid;    /* timer id */
                        int _overrun;           /* overrun count */
                        compat_sigval_t _sigval;        /* same as below */
-                       int _sys_private;       /* not to be passed to user */
-                       int _overrun_incr;      /* amount to add to overrun */
                } _timer;
 
                /* POSIX.1b signals */

diff --git a/arch/x86/kernel/signal_compat.c b/arch/x86/kernel/signal_compat.c
index 8c6da1a..85425ea 100644 (file)
--- a/arch/x86/kernel/signal_compat.c
+++ b/arch/x86/kernel/signal_compat.c
@@ -64,7 +64,7 @@ static inline void signal_compat_build_tests(void)
        CHECK_SI_SIZE   (_kill, 2*sizeof(int));
 
        CHECK_CSI_OFFSET(_timer);
-       CHECK_CSI_SIZE  (_timer, 5*sizeof(int));
+       CHECK_CSI_SIZE  (_timer, 3*sizeof(int));
        CHECK_SI_SIZE   (_timer, 6*sizeof(int));
 
        CHECK_CSI_OFFSET(_rt);