summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/asm-x86/segment.h9
-rw-r--r--include/asm-x86/segment_32.h3
2 files changed, 9 insertions, 3 deletions
diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
index 605068280e28..b3a7a3e9fb19 100644
--- a/include/asm-x86/segment.h
+++ b/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/include/asm-x86/segment_32.h b/include/asm-x86/segment_32.h
index 597a47c2515f..ff186e34798a 100644
--- a/include/asm-x86/segment_32.h
+++ b/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.
*/