diff options
| author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:25:10 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:00 -0400 |
| commit | ac56ef61a1f65aaf1cb31dca2a407322c5f0a4dd (patch) | |
| tree | 3334f6ea6b87d81ddded9e2b27139991afcfb099 /include/asm-x86/apicdef.h | |
| parent | 5733f627498121870b081b7ab73ffba01348f8cd (diff) | |
x86: provide APIC_INTEGRATED definition for x86_64
it is always integrated, so define as 1.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/apicdef.h')
| -rw-r--r-- | include/asm-x86/apicdef.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h index 550af7a6f88e..b0c6b285c916 100644 --- a/include/asm-x86/apicdef.h +++ b/include/asm-x86/apicdef.h | |||
| @@ -22,7 +22,11 @@ | |||
| 22 | #define APIC_LVR_MASK 0xFF00FF | 22 | #define APIC_LVR_MASK 0xFF00FF |
| 23 | #define GET_APIC_VERSION(x) ((x)&0xFFu) | 23 | #define GET_APIC_VERSION(x) ((x)&0xFFu) |
| 24 | #define GET_APIC_MAXLVT(x) (((x)>>16)&0xFFu) | 24 | #define GET_APIC_MAXLVT(x) (((x)>>16)&0xFFu) |
| 25 | #define APIC_INTEGRATED(x) ((x)&0xF0u) | 25 | #ifdef CONFIG_X86_32 |
| 26 | # define APIC_INTEGRATED(x) ((x)&0xF0u) | ||
| 27 | #else | ||
| 28 | # define APIC_INTEGRATED(x) (1) | ||
| 29 | #endif | ||
| 26 | #define APIC_XAPIC(x) ((x) >= 0x14) | 30 | #define APIC_XAPIC(x) ((x) >= 0x14) |
| 27 | #define APIC_TASKPRI 0x80 | 31 | #define APIC_TASKPRI 0x80 |
| 28 | #define APIC_TPRI_MASK 0xFFu | 32 | #define APIC_TPRI_MASK 0xFFu |