From 068c69f9f611af697b2006c562ae06130f891269 Mon Sep 17 00:00:00 2001 From: Glauber de Oliveira Costa Date: Wed, 19 Mar 2008 14:25:10 -0300 Subject: [PATCH] --- yaml --- r: 88795 b: refs/heads/master c: ac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd h: refs/heads/master i: 88793: 0644e8862225f159515f9127ad0790a91221f168 88791: cb107b2d3fda6f64a729850d3d6222e7c465af85 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/apicdef.h | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 08da793abd91..581365d79bc0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5733f627498121870b081b7ab73ffba01348f8cd +refs/heads/master: ac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd diff --git a/trunk/include/asm-x86/apicdef.h b/trunk/include/asm-x86/apicdef.h index 550af7a6f88e..b0c6b285c916 100644 --- a/trunk/include/asm-x86/apicdef.h +++ b/trunk/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