diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-10 13:50:00 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-11 14:17:36 -0400 |
| commit | d84705969f898f294bc3fc32eca33580f14105bd (patch) | |
| tree | c59c7e835820c6bfb5a957f70e58fee1699a6b38 /include/asm-x86/apicdef.h | |
| parent | 725c25819e4a0dafdcf42a5f31bc569341919c7c (diff) | |
| parent | 11494547b1754c4f3bd7f707ab869e2adf54d52f (diff) | |
Merge branch 'x86/apic' into x86-v28-for-linus-phase4-B
Conflicts:
arch/x86/kernel/apic_32.c
arch/x86/kernel/apic_64.c
arch/x86/kernel/setup.c
drivers/pci/intel-iommu.c
include/asm-x86/cpufeature.h
include/asm-x86/dma-mapping.h
Diffstat (limited to 'include/asm-x86/apicdef.h')
| -rw-r--r-- | include/asm-x86/apicdef.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h index c40687da20fc..b922c85ac91d 100644 --- a/include/asm-x86/apicdef.h +++ b/include/asm-x86/apicdef.h | |||
| @@ -105,6 +105,7 @@ | |||
| 105 | #define APIC_TMICT 0x380 | 105 | #define APIC_TMICT 0x380 |
| 106 | #define APIC_TMCCT 0x390 | 106 | #define APIC_TMCCT 0x390 |
| 107 | #define APIC_TDCR 0x3E0 | 107 | #define APIC_TDCR 0x3E0 |
| 108 | #define APIC_SELF_IPI 0x3F0 | ||
| 108 | #define APIC_TDR_DIV_TMBASE (1 << 2) | 109 | #define APIC_TDR_DIV_TMBASE (1 << 2) |
| 109 | #define APIC_TDR_DIV_1 0xB | 110 | #define APIC_TDR_DIV_1 0xB |
| 110 | #define APIC_TDR_DIV_2 0x0 | 111 | #define APIC_TDR_DIV_2 0x0 |
| @@ -128,6 +129,8 @@ | |||
| 128 | #define APIC_EILVT3 0x530 | 129 | #define APIC_EILVT3 0x530 |
| 129 | 130 | ||
| 130 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) | 131 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) |
| 132 | #define APIC_BASE_MSR 0x800 | ||
| 133 | #define X2APIC_ENABLE (1UL << 10) | ||
| 131 | 134 | ||
| 132 | #ifdef CONFIG_X86_32 | 135 | #ifdef CONFIG_X86_32 |
| 133 | # define MAX_IO_APICS 64 | 136 | # define MAX_IO_APICS 64 |