---

yaml --- r: 79949 b: refs/heads/master c: cef1895 h: refs/heads/master i: 79947: 17c969f v: v3
git-mirror · Jan 30, 2008 · 322eb90 · 322eb90
1 parent 9a3ba67
commit 322eb90
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eee3af4a2c83a97fff107ddc445d9df6fded9ce4
+refs/heads/master: cef189508b2f043fdc2e354645803b6ce004aac3
diff --git a/trunk/include/asm-x86/segment.h b/trunk/include/asm-x86/segment.h
@@ -1,5 +1,14 @@
+#ifndef _ASM_X86_SEGMENT_H_
+#define _ASM_X86_SEGMENT_H_
+
 #ifdef CONFIG_X86_32
 # include "segment_32.h"
 #else
 # include "segment_64.h"
 #endif
+
+#ifndef CONFIG_PARAVIRT
+#define get_kernel_rpl()  0
+#endif
+
+#endif
diff --git a/trunk/include/asm-x86/segment_32.h b/trunk/include/asm-x86/segment_32.h
@@ -129,9 +129,6 @@
 #define SEGMENT_LDT		0x4
 #define SEGMENT_GDT		0x0
 
-#ifndef CONFIG_PARAVIRT
-#define get_kernel_rpl()  0
-#endif
 /*
  * Matching rules for certain types of segments.
  */