Merge git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6

[linux-2.6-omap-h63xx.git] / include / asm-x86 / sigcontext32.h

diff --git a/include/asm-x86/sigcontext32.h b/include/asm-x86/sigcontext32.h
index 57a9686fb4917a74d0ca9f6f6f18ffd3b5bdb665..8c347032c2f28d5a390d75306100d0105b74c5ad 100644 (file)
--- a/include/asm-x86/sigcontext32.h
+++ b/include/asm-x86/sigcontext32.h
@@ -1,5 +1,5 @@
-#ifndef _SIGCONTEXT32_H
-#define _SIGCONTEXT32_H 1
+#ifndef ASM_X86__SIGCONTEXT32_H
+#define ASM_X86__SIGCONTEXT32_H
 
 /* signal context for 32bit programs. */
 
@@ -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 {
@@ -68,4 +72,4 @@ struct sigcontext_ia32 {
        unsigned int cr2;
 };
 
-#endif
+#endif /* ASM_X86__SIGCONTEXT32_H */