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-default | |
| 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-default')
| -rw-r--r-- | include/asm-x86/mach-default/mach_apic.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-x86/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h index 3d2b455581ec..e7ff8ac6abc5 100644 --- a/include/asm-x86/mach-default/mach_apic.h +++ b/include/asm-x86/mach-default/mach_apic.h | |||
| @@ -48,10 +48,10 @@ static inline void init_apic_ldr(void) | |||
| 48 | { | 48 | { |
| 49 | unsigned long val; | 49 | unsigned long val; |
| 50 | 50 | ||
| 51 | apic_write_around(APIC_DFR, APIC_DFR_VALUE); | 51 | apic_write(APIC_DFR, APIC_DFR_VALUE); |
| 52 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | 52 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; |
| 53 | val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id()); | 53 | val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id()); |
| 54 | apic_write_around(APIC_LDR, val); | 54 | apic_write(APIC_LDR, val); |
| 55 | } | 55 | } |
| 56 | 56 | ||
| 57 | static inline int apic_id_registered(void) | 57 | static inline int apic_id_registered(void) |