From bb77db2b90a020bce5746d2e4c6cefbc41327eec Mon Sep 17 00:00:00 2001
From: Vegard Nossum <vegard.nossum@gmail.com>
Date: Wed, 28 May 2008 09:46:19 +0200
Subject: [PATCH] --- yaml --- r: 99391 b: refs/heads/master c:
 6330a30a76c1e62d4b4ec238368957f8febf9113 h: refs/heads/master i:   99389:
 46da7f4d8c5c773f3b09bcd2c5a85abb1d87c88a   99387:
 e4997b456f7280657fce00f8fae4943e0c92de6d   99383:
 0346f9e9ea3d6393391028ca91af86d23662b533   99375:
 c708c52bffad59345578d1b6382a803574e24e4c   99359:
 3e65bd295e07a9f8801a4ce06ebdb06928ea6965   99327:
 e206a8aecbd055021f8d5408da59f2698ea712aa v: v3

---
 [refs]                                  | 2 +-
 trunk/include/asm-x86/processor-flags.h | 6 ++++++
 trunk/include/asm-x86/ptrace.h          | 8 +++++---
 trunk/include/asm-x86/vm86.h            | 8 +-------
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 49fb988ef111..49105e4ef852 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83bea8e1fa0c47b30664b6f92397c016c22f77fb
+refs/heads/master: 6330a30a76c1e62d4b4ec238368957f8febf9113
diff --git a/trunk/include/asm-x86/processor-flags.h b/trunk/include/asm-x86/processor-flags.h
index 199cab107d85..092b39b3a7e6 100644
--- a/trunk/include/asm-x86/processor-flags.h
+++ b/trunk/include/asm-x86/processor-flags.h
@@ -88,4 +88,10 @@
 #define CX86_ARR_BASE	0xc4
 #define CX86_RCR_BASE	0xdc
 
+#ifdef CONFIG_VM86
+#define X86_VM_MASK	X86_EFLAGS_VM
+#else
+#define X86_VM_MASK	0 /* No VM86 support */
+#endif
+
 #endif	/* __ASM_I386_PROCESSOR_FLAGS_H */
diff --git a/trunk/include/asm-x86/ptrace.h b/trunk/include/asm-x86/ptrace.h
index 9f922b0b95d6..8a71db803da6 100644
--- a/trunk/include/asm-x86/ptrace.h
+++ b/trunk/include/asm-x86/ptrace.h
@@ -3,7 +3,12 @@
 
 #include <linux/compiler.h>	/* For __user */
 #include <asm/ptrace-abi.h>
+#include <asm/processor-flags.h>
 
+#ifdef __KERNEL__
+#include <asm/ds.h>		/* the DS BTS struct is used for ptrace too */
+#include <asm/segment.h>
+#endif
 
 #ifndef __ASSEMBLY__
 
@@ -55,9 +60,6 @@ struct pt_regs {
 	unsigned long ss;
 };
 
-#include <asm/vm86.h>
-#include <asm/segment.h>
-
 #endif /* __KERNEL__ */
 
 #else /* __i386__ */
diff --git a/trunk/include/asm-x86/vm86.h b/trunk/include/asm-x86/vm86.h
index cbf4a0effa75..5ce351325e01 100644
--- a/trunk/include/asm-x86/vm86.h
+++ b/trunk/include/asm-x86/vm86.h
@@ -115,7 +115,6 @@ struct vm86plus_info_struct {
 	unsigned long is_vm86pus:1;	      /* for vm86 internal use */
 	unsigned char vm86dbg_intxxtab[32];   /* for debugger */
 };
-
 struct vm86plus_struct {
 	struct vm86_regs regs;
 	unsigned long flags;
@@ -128,11 +127,7 @@ struct vm86plus_struct {
 
 #ifdef __KERNEL__
 
-#ifdef CONFIG_VM86
-#define X86_VM_MASK	X86_EFLAGS_VM
-#else
-#define X86_VM_MASK	0 /* No VM86 support */
-#endif
+#include <asm/ptrace.h>
 
 /*
  * This is the (kernel) stack-layout when we have done a "SAVE_ALL" from vm86
@@ -142,7 +137,6 @@ struct vm86plus_struct {
  * at the end of the structure. Look at ptrace.h to see the "normal"
  * setup. For user space layout see 'struct vm86_regs' above.
  */
-#include <asm/ptrace.h>
 
 struct kernel_vm86_regs {
 /*