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 a3c7f271ad4c79dc982597b4ff99edcf01400abd..dd32fe19ec58447206fb1d2a4000dff75a8fb340 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 acf8aa07cbe099e35972e7d381d743da37bb2a5e..cf3bcacec027df7c2168b77a67f0fe604b36ebf0 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 8a2aecfe9b0246cbbea75a66aaa3020322fc87c5..e02de2fd56e3610c442eb02a1e8389fa386c605e 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 5e6a63641a5f1916da30507eb744534a2da95486..3a187c4932a5c4cb55b712aad9eac2fc14670b52 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 fa38c78de0f001f15c63d65632a78f3ce37c3def..2d9f4fd5f74a1dee74d3c550a969a7b4225870e3 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 62a7b83025dd24ab264d2d2901931b35c5ae9c2d..59ab9fa784b389ab2b26481e30b585b47c75a0af 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 2cbd75dd2fd3542b9cb993fb6fd4f436e605c062..1b6886a785623c67045d04d710a28b45d7dcda84 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 8c6da1a643da24feedd225a5c064d6f5ca558245..85425ea30661469fe564e3c6dc79bda2a777df33 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);