From: Glauber de Oliveira Costa Date: Wed, 19 Mar 2008 17:25:10 +0000 (-0300) Subject: x86: provide APIC_INTEGRATED definition for x86_64 X-Git-Tag: v2.6.26-rc1~1154^2~387 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd;p=linux-2.6-omap-h63xx.git x86: provide APIC_INTEGRATED definition for x86_64 it is always integrated, so define as 1. Signed-off-by: Glauber Costa Signed-off-by: Ingo Molnar --- diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h index 550af7a6f88..b0c6b285c91 100644 --- a/include/asm-x86/apicdef.h +++ b/include/asm-x86/apicdef.h @@ -22,7 +22,11 @@ #define APIC_LVR_MASK 0xFF00FF #define GET_APIC_VERSION(x) ((x)&0xFFu) #define GET_APIC_MAXLVT(x) (((x)>>16)&0xFFu) -#define APIC_INTEGRATED(x) ((x)&0xF0u) +#ifdef CONFIG_X86_32 +# define APIC_INTEGRATED(x) ((x)&0xF0u) +#else +# define APIC_INTEGRATED(x) (1) +#endif #define APIC_XAPIC(x) ((x) >= 0x14) #define APIC_TASKPRI 0x80 #define APIC_TPRI_MASK 0xFFu