diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 17:00:05 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 17:00:05 -0400 |
| commit | 453c1404c5273a30d715e5a83372a78cff70b6d9 (patch) | |
| tree | 94a5a3abd85137c4def416a84a45989751260f20 /include/asm-x86/mach-summit/mach_apic.h | |
| parent | a208f37a465e222218974ab20a31b42b7b4893b2 (diff) | |
| parent | 35b680557f95564f70f21a8d3f5c72e101fab260 (diff) | |
Merge branch 'x86/apic' into x86/x2apic
Conflicts:
arch/x86/kernel/paravirt.c
arch/x86/kernel/smpboot.c
arch/x86/kernel/vmi_32.c
arch/x86/lguest/boot.c
arch/x86/xen/enlighten.c
include/asm-x86/apic.h
include/asm-x86/paravirt.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/mach-summit/mach_apic.h')
| -rw-r--r-- | include/asm-x86/mach-summit/mach_apic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/mach-summit/mach_apic.h b/include/asm-x86/mach-summit/mach_apic.h index 1f76c2e70232..75d2c95005d7 100644 --- a/include/asm-x86/mach-summit/mach_apic.h +++ b/include/asm-x86/mach-summit/mach_apic.h | |||
| @@ -63,10 +63,10 @@ static inline void init_apic_ldr(void) | |||
| 63 | * BIOS puts 5 CPUs in one APIC cluster, we're hosed. */ | 63 | * BIOS puts 5 CPUs in one APIC cluster, we're hosed. */ |
| 64 | BUG_ON(count >= XAPIC_DEST_CPUS_SHIFT); | 64 | BUG_ON(count >= XAPIC_DEST_CPUS_SHIFT); |
| 65 | id = my_cluster | (1UL << count); | 65 | id = my_cluster | (1UL << count); |
| 66 | apic_write_around(APIC_DFR, APIC_DFR_VALUE); | 66 | apic_write(APIC_DFR, APIC_DFR_VALUE); |
| 67 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | 67 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; |
| 68 | val |= SET_APIC_LOGICAL_ID(id); | 68 | val |= SET_APIC_LOGICAL_ID(id); |
| 69 | apic_write_around(APIC_LDR, val); | 69 | apic_write(APIC_LDR, val); |
| 70 | } | 70 | } |
| 71 | 71 | ||
| 72 | static inline int multi_timer_check(int apic, int irq) | 72 | static inline int multi_timer_check(int apic, int irq) |