diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:27:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:27:23 +0200 |
| commit | 0c8c708a7e6b52556ee9079041f504191ec5f0e9 (patch) | |
| tree | fb8da2f5e70ac1d21d41d5a900e48d42c1c999eb /include/asm-x86/apicdef.h | |
| parent | b380b0d4f7dffcc235c0facefa537d4655619101 (diff) | |
| parent | d3d0ba7b8fb8f57c33207adcb41f40c176148c03 (diff) | |
Merge branch 'x86/core' into x86/unify-cpu-detect
Diffstat (limited to 'include/asm-x86/apicdef.h')
| -rw-r--r-- | include/asm-x86/apicdef.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h index 6b9008c7873..b922c85ac91 100644 --- a/include/asm-x86/apicdef.h +++ b/include/asm-x86/apicdef.h @@ -1,5 +1,5 @@ -#ifndef _ASM_X86_APICDEF_H -#define _ASM_X86_APICDEF_H +#ifndef ASM_X86__APICDEF_H +#define ASM_X86__APICDEF_H /* * Constants for various Intel APICs. (local APIC, IOAPIC, etc.) @@ -105,6 +105,7 @@ #define APIC_TMICT 0x380 #define APIC_TMCCT 0x390 #define APIC_TDCR 0x3E0 +#define APIC_SELF_IPI 0x3F0 #define APIC_TDR_DIV_TMBASE (1 << 2) #define APIC_TDR_DIV_1 0xB #define APIC_TDR_DIV_2 0x0 @@ -128,6 +129,8 @@ #define APIC_EILVT3 0x530 #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) +#define APIC_BASE_MSR 0x800 +#define X2APIC_ENABLE (1UL << 10) #ifdef CONFIG_X86_32 # define MAX_IO_APICS 64 @@ -411,4 +414,4 @@ struct local_apic { #else #define BAD_APICID 0xFFFFu #endif -#endif +#endif /* ASM_X86__APICDEF_H */ |