diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 20:23:20 +0200 |
| commit | 0afe2db21394820d32646a695eccf3fbfe6ab5c7 (patch) | |
| tree | 6d925383f444a242ebc77d167420efb7e6ad8d99 /include/asm-x86/sigcontext32.h | |
| parent | d84705969f898f294bc3fc32eca33580f14105bd (diff) | |
| parent | 43603c8df97f246e8be7b9cc92a8f968a85108bd (diff) | |
| download | kernel_samsung_smdk4412-0afe2db21394820d32646a695eccf3fbfe6ab5c7.zip kernel_samsung_smdk4412-0afe2db21394820d32646a695eccf3fbfe6ab5c7.tar.gz kernel_samsung_smdk4412-0afe2db21394820d32646a695eccf3fbfe6ab5c7.tar.bz2 | |
Merge branch 'x86/unify-cpu-detect' into x86-v28-for-linus-phase4-D
Conflicts:
arch/x86/kernel/cpu/common.c
arch/x86/kernel/signal_64.c
include/asm-x86/cpufeature.h
Diffstat (limited to 'include/asm-x86/sigcontext32.h')
| -rw-r--r-- | include/asm-x86/sigcontext32.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/sigcontext32.h b/include/asm-x86/sigcontext32.h index 4e2ec73..8c34703 100644 --- a/include/asm-x86/sigcontext32.h +++ b/include/asm-x86/sigcontext32.h @@ -40,7 +40,11 @@ struct _fpstate_ia32 { __u32 reserved; struct _fpxreg _fxsr_st[8]; struct _xmmreg _xmm[8]; /* It's actually 16 */ - __u32 padding[56]; + __u32 padding[44]; + union { + __u32 padding2[12]; + struct _fpx_sw_bytes sw_reserved; + }; }; struct sigcontext_ia32 { |