Merge branch 'x86/core' into x86/apic

[karo-tx-linux.git] / include / asm-x86 / ucontext.h

diff --git a/include/asm-x86/ucontext.h b/include/asm-x86/ucontext.h
index 175c8cb597317f28866490fc0f1834900d9b410e..9948dd328084ef66461d2dc92c996235fc78eb5e 100644 (file)
--- a/include/asm-x86/ucontext.h
+++ b/include/asm-x86/ucontext.h
@@ -1,13 +1,12 @@
-#ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "ucontext_32.h"
-# else
-#  include "ucontext_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "ucontext_32.h"
-# else
-#  include "ucontext_64.h"
-# endif
-#endif
+#ifndef ASM_X86__UCONTEXT_H
+#define ASM_X86__UCONTEXT_H
+
+struct ucontext {
+       unsigned long     uc_flags;
+       struct ucontext  *uc_link;
+       stack_t           uc_stack;
+       struct sigcontext uc_mcontext;
+       sigset_t          uc_sigmask;   /* mask last for extensibility */
+};
+
+#endif /* ASM_X86__UCONTEXT_H */