summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2017-07-19 22:18:51 -0500
committerEric W. Biederman <ebiederm@xmission.com>2018-01-12 14:34:46 -0600
commit2f82a46f66c8754dfe690d469899d12819b19c58 (patch)
tree3f3581e9a6c6c928c82bea139136d45225c609fe /arch/x86
parent9943d3accb4ec5a85e72c65a9959257fa7d12500 (diff)
downloadlinux-2f82a46f66c8754dfe690d469899d12819b19c58.tar.gz
linux-2f82a46f66c8754dfe690d469899d12819b19c58.tar.bz2
linux-2f82a46f66c8754dfe690d469899d12819b19c58.zip
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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/include/asm/compat.h2
-rw-r--r--arch/x86/kernel/signal_compat.c2
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
index 2cbd75dd2fd3..1b6886a78562 100644
--- 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 8c6da1a643da..85425ea30661 100644
--- 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);