diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-09-05 03:32:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-09-08 04:03:59 -0400 |
| commit | 8fcb346b910e860d2525457742ae984c4ddc64b5 (patch) | |
| tree | f85c69e89e7e11d3db2b3584734304e1a4b9dbb6 /arch/x86/include/uapi | |
| parent | db1e031401c6abab983919e882916d028f3b385e (diff) | |
x86/headers: Convert sigcontext_ia32 uses to sigcontext_32
Use the new name in kernel code, and move the old name to the
user-space-only legacy section of the UAPI header.
Acked-by: Mikko Rapeli <mikko.rapeli@iki.fi>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-kernel@vger.kernel.org
Link: http://lkml.kernel.org/r/1441438363-9999-14-git-send-email-mingo@kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/uapi')
| -rw-r--r-- | arch/x86/include/uapi/asm/sigcontext.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/arch/x86/include/uapi/asm/sigcontext.h b/arch/x86/include/uapi/asm/sigcontext.h index 592bfafd5cb2..4411e6a8f8e7 100644 --- a/arch/x86/include/uapi/asm/sigcontext.h +++ b/arch/x86/include/uapi/asm/sigcontext.h | |||
| @@ -190,6 +190,9 @@ struct _xstate { | |||
| 190 | /* New processor state extensions go here: */ | 190 | /* New processor state extensions go here: */ |
| 191 | }; | 191 | }; |
| 192 | 192 | ||
| 193 | /* | ||
| 194 | * The 32-bit signal frame: | ||
| 195 | */ | ||
| 193 | struct sigcontext_32 { | 196 | struct sigcontext_32 { |
| 194 | __u16 gs, __gsh; | 197 | __u16 gs, __gsh; |
| 195 | __u16 fs, __fsh; | 198 | __u16 fs, __fsh; |
| @@ -223,8 +226,9 @@ struct sigcontext_32 { | |||
| 223 | __u32 cr2; | 226 | __u32 cr2; |
| 224 | }; | 227 | }; |
| 225 | 228 | ||
| 226 | #define sigcontext_ia32 sigcontext_32 | 229 | /* |
| 227 | 230 | * The 64-bit signal frame: | |
| 231 | */ | ||
| 228 | struct sigcontext_64 { | 232 | struct sigcontext_64 { |
| 229 | __u64 r8; | 233 | __u64 r8; |
| 230 | __u64 r9; | 234 | __u64 r9; |
| @@ -282,7 +286,9 @@ struct sigcontext_64 { | |||
| 282 | */ | 286 | */ |
| 283 | #ifndef __KERNEL__ | 287 | #ifndef __KERNEL__ |
| 284 | 288 | ||
| 285 | #define _fpstate_ia32 _fpstate_32 | 289 | #define _fpstate_ia32 _fpstate_32 |
| 290 | #define sigcontext_ia32 sigcontext_32 | ||
| 291 | |||
| 286 | 292 | ||
| 287 | # ifdef __i386__ | 293 | # ifdef __i386__ |
| 288 | struct sigcontext { | 294 | struct sigcontext { |
