diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:14 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:14 -0500 |
commit | cff90dbfe41f2c8eabe2d0a7e379829f4a9980af (patch) | |
tree | 966526556fb19f10d9ad6d66b65da67ab4412328 /include/asm-x86/apicdef.h | |
parent | 2d539553c96771bc8f77156f27500d35e1fe114c (diff) |
x86: prepare unification of include/asm-x86/apic_32/64.h
White space and coding style clenaup.
Move the K8 local apic defines to apicdef.h, where they belong
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/apicdef.h')
-rw-r--r-- | include/asm-x86/apicdef.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h index 83ac1e6e3625..5f7abe9b5f87 100644 --- a/include/asm-x86/apicdef.h +++ b/include/asm-x86/apicdef.h | |||
@@ -98,7 +98,7 @@ | |||
98 | #define APIC_SEND_PENDING (1<<12) | 98 | #define APIC_SEND_PENDING (1<<12) |
99 | #define APIC_MODE_MASK 0x700 | 99 | #define APIC_MODE_MASK 0x700 |
100 | #define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7) | 100 | #define GET_APIC_DELIVERY_MODE(x) (((x)>>8)&0x7) |
101 | #define SET_APIC_DELIVERY_MODE(x,y) (((x)&~0x700)|((y)<<8)) | 101 | #define SET_APIC_DELIVERY_MODE(x, y) (((x)&~0x700)|((y)<<8)) |
102 | #define APIC_MODE_FIXED 0x0 | 102 | #define APIC_MODE_FIXED 0x0 |
103 | #define APIC_MODE_NMI 0x4 | 103 | #define APIC_MODE_NMI 0x4 |
104 | #define APIC_MODE_EXTINT 0x7 | 104 | #define APIC_MODE_EXTINT 0x7 |
@@ -116,6 +116,14 @@ | |||
116 | #define APIC_TDR_DIV_32 0x8 | 116 | #define APIC_TDR_DIV_32 0x8 |
117 | #define APIC_TDR_DIV_64 0x9 | 117 | #define APIC_TDR_DIV_64 0x9 |
118 | #define APIC_TDR_DIV_128 0xA | 118 | #define APIC_TDR_DIV_128 0xA |
119 | |||
120 | #define K8_APIC_EXT_LVT_BASE 0x500 | ||
121 | #define K8_APIC_EXT_INT_MSG_FIX 0x0 | ||
122 | #define K8_APIC_EXT_INT_MSG_SMI 0x2 | ||
123 | #define K8_APIC_EXT_INT_MSG_NMI 0x4 | ||
124 | #define K8_APIC_EXT_INT_MSG_EXT 0x7 | ||
125 | #define K8_APIC_EXT_LVT_ENTRY_THRESHOLD 0 | ||
126 | |||
119 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) | 127 | #define APIC_BASE (fix_to_virt(FIX_APIC_BASE)) |
120 | 128 | ||
121 | #ifdef CONFIG_X86_32 | 129 | #ifdef CONFIG_X86_32 |