x86: put get_kernel_rpl in a common location

This macro is useful for both i386 and x86_64, so put it in a common
location, where both arches can grab it.

Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
index 605068280e2852435a84377f84e26c05df36138e..b3a7a3e9fb19431832f7b65cf1e285da612fb3e9 100644 (file)
--- 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 597a47c2515f46a90acfffc987a0ad1bc5ff62a7..ff186e34798a6f7d37e42901999e6310632f7fa0 100644 (file)
--- 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.
  */