Glauber de Oliveira Costa
2007-Dec-07 11:06 UTC
[PATCH 1/3] [PATCH] 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> --- 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
Hi, In this patch, I unify segment_32.h and segment_64.h into segment.h They have some common parts, but a considerable ammount of code still has to be around ifdefs. The only patch that is really important to paravirt is the first one, that moves a paravirt definition into the common header. The other two are just normal integration, and pretty much independent
* Glauber de Oliveira Costa <gcosta@redhat.com> wrote:> Hi, > > In this patch, I unify segment_32.h and segment_64.h into segment.h > They have some common parts, but a considerable ammount of code still > has to be around ifdefs. > > The only patch that is really important to paravirt is the first one, > that moves a paravirt definition into the common header. The other two > are just normal integration, and pretty much independentthanks, i've picked them up for x86.git. Ingo