[PATCH 1/3] [PATCH] put get_kernel_rpl in a common location

From: Glauber de Oliveira Costa
Date: Fri Dec 07 2007 - 14:07:47 EST


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@xxxxxxxxxx>
---
include/asm-x86/segment.h | 9 +++++++++
include/asm-x86/segment_32.h | 3 ---
2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
index 6050682..b3a7a3e 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 597a47c..ff186e3 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.
*/
--
1.4.4.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/