From 322eb901f4c1141182e495ced79e1d6cd6e243e6 Mon Sep 17 00:00:00 2001
From: Glauber de Oliveira Costa <gcosta@redhat.com>
Date: Wed, 30 Jan 2008 13:31:09 +0100
Subject: [PATCH] --- yaml --- r: 79949 b: refs/heads/master c:
 cef189508b2f043fdc2e354645803b6ce004aac3 h: refs/heads/master i:   79947:
 17c969f96203c0859793763224f855521d146314 v: v3

---
 [refs]                             | 2 +-
 trunk/include/asm-x86/segment.h    | 9 +++++++++
 trunk/include/asm-x86/segment_32.h | 3 ---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 4f5b518f1583..2a8f12eac27d 100644
--- 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
index 605068280e28..b3a7a3e9fb19 100644
--- 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
index 597a47c2515f..ff186e34798a 100644
--- 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.
  */