diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-01-30 13:31:09 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:31:09 +0100 |
| commit | cef189508b2f043fdc2e354645803b6ce004aac3 (patch) | |
| tree | 1d5ebb5e1ef7ff3d8de1299949dff0328f0f31d9 | |
| parent | eee3af4a2c83a97fff107ddc445d9df6fded9ce4 (diff) | |
| download | op-kernel-dev-cef189508b2f043fdc2e354645803b6ce004aac3.zip op-kernel-dev-cef189508b2f043fdc2e354645803b6ce004aac3.tar.gz | |
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>
| -rw-r--r-- | include/asm-x86/segment.h | 9 | ||||
| -rw-r--r-- | 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. */ |
