diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-25 22:24:19 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-02-03 15:09:22 -0500 |
commit | 574c4866e33d648520a8bd5bf6f573ea6e554e88 (patch) | |
tree | 354c1c42819cba60481a854281f1e130c7cec260 /arch/x86/include/uapi/asm/signal.h | |
parent | 92a3ce4a1e0047215aa0a0b30cc333bd32b866a8 (diff) |
consolidate kernel-side struct sigaction declarations
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/x86/include/uapi/asm/signal.h')
-rw-r--r-- | arch/x86/include/uapi/asm/signal.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/uapi/asm/signal.h b/arch/x86/include/uapi/asm/signal.h index e52443fc026b..8264f47cf53e 100644 --- a/arch/x86/include/uapi/asm/signal.h +++ b/arch/x86/include/uapi/asm/signal.h | |||
@@ -95,9 +95,9 @@ typedef unsigned long sigset_t; | |||
95 | #ifndef __ASSEMBLY__ | 95 | #ifndef __ASSEMBLY__ |
96 | 96 | ||
97 | 97 | ||
98 | #ifdef __i386__ | ||
99 | # ifndef __KERNEL__ | 98 | # ifndef __KERNEL__ |
100 | /* Here we must cater to libcs that poke about in kernel headers. */ | 99 | /* Here we must cater to libcs that poke about in kernel headers. */ |
100 | #ifdef __i386__ | ||
101 | 101 | ||
102 | struct sigaction { | 102 | struct sigaction { |
103 | union { | 103 | union { |
@@ -112,7 +112,6 @@ struct sigaction { | |||
112 | #define sa_handler _u._sa_handler | 112 | #define sa_handler _u._sa_handler |
113 | #define sa_sigaction _u._sa_sigaction | 113 | #define sa_sigaction _u._sa_sigaction |
114 | 114 | ||
115 | # endif /* ! __KERNEL__ */ | ||
116 | #else /* __i386__ */ | 115 | #else /* __i386__ */ |
117 | 116 | ||
118 | struct sigaction { | 117 | struct sigaction { |
@@ -123,6 +122,7 @@ struct sigaction { | |||
123 | }; | 122 | }; |
124 | 123 | ||
125 | #endif /* !__i386__ */ | 124 | #endif /* !__i386__ */ |
125 | # endif /* ! __KERNEL__ */ | ||
126 | 126 | ||
127 | typedef struct sigaltstack { | 127 | typedef struct sigaltstack { |
128 | void __user *ss_sp; | 128 | void __user *ss_sp; |