From: Glauber de Oliveira Costa Date: Wed, 30 Jan 2008 12:31:09 +0000 (+0100) Subject: x86: put get_kernel_rpl in a common location X-Git-Tag: Ubuntu-5.0.0-8.9~36934^2~626 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=cef189508b2f043fdc2e354645803b6ce004aac3;p=mirror_ubuntu-disco-kernel.git 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 Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner --- 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. */