aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/apic_64.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index 9dd4ee4735f5..3963f590c3d4 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -626,10 +626,10 @@ int __init verify_local_APIC(void)
626 /* 626 /*
627 * The ID register is read/write in a real APIC. 627 * The ID register is read/write in a real APIC.
628 */ 628 */
629 reg0 = read_apic_id(); 629 reg0 = apic_read(APIC_ID);
630 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0); 630 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0);
631 apic_write(APIC_ID, reg0 ^ APIC_ID_MASK); 631 apic_write(APIC_ID, reg0 ^ APIC_ID_MASK);
632 reg1 = read_apic_id(); 632 reg1 = apic_read(APIC_ID);
633 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1); 633 apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1);
634 apic_write(APIC_ID, reg0); 634 apic_write(APIC_ID, reg0);
635 if (reg1 != (reg0 ^ APIC_ID_MASK)) 635 if (reg1 != (reg0 ^ APIC_ID_MASK))
@@ -1137,7 +1137,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state)
1137 1137
1138 maxlvt = lapic_get_maxlvt(); 1138 maxlvt = lapic_get_maxlvt();
1139 1139
1140 apic_pm_state.apic_id = read_apic_id(); 1140 apic_pm_state.apic_id = apic_read(APIC_ID);
1141 apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI); 1141 apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI);
1142 apic_pm_state.apic_ldr = apic_read(APIC_LDR); 1142 apic_pm_state.apic_ldr = apic_read(APIC_LDR);
1143 apic_pm_state.apic_dfr = apic_read(APIC_DFR); 1143 apic_pm_state.apic_dfr = apic_read(APIC_DFR);