diff options
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
| -rw-r--r-- | arch/x86/kernel/apic_64.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index fa6cdee6d30..dfeda91fa80 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c @@ -160,7 +160,7 @@ void enable_NMI_through_LVT0 (void * dummy) apic_write(APIC_LVT0, v); } -int get_maxlvt(void) +int lapic_get_maxlvt(void) { unsigned int v, maxlvt; @@ -194,7 +194,7 @@ void clear_local_APIC(void) int maxlvt; unsigned int v; - maxlvt = get_maxlvt(); + maxlvt = lapic_get_maxlvt(); /* * Masking an LVT entry can trigger a local APIC error @@ -333,7 +333,7 @@ int __init verify_local_APIC(void) reg1 = GET_APIC_VERSION(reg0); if (reg1 == 0x00 || reg1 == 0xff) return 0; - reg1 = get_maxlvt(); + reg1 = lapic_get_maxlvt(); if (reg1 < 0x02 || reg1 == 0xff) return 0; @@ -519,7 +519,7 @@ void __cpuinit setup_local_APIC (void) { unsigned oldvalue; - maxlvt = get_maxlvt(); + maxlvt = lapic_get_maxlvt(); oldvalue = apic_read(APIC_ESR); value = ERROR_APIC_VECTOR; // enables sending errors apic_write(APIC_LVTERR, value); @@ -571,7 +571,7 @@ static int lapic_suspend(struct sys_device *dev, pm_message_t state) if (!apic_pm_state.active) return 0; - maxlvt = get_maxlvt(); + maxlvt = lapic_get_maxlvt(); apic_pm_state.apic_id = apic_read(APIC_ID); apic_pm_state.apic_taskpri = apic_read(APIC_TASKPRI); @@ -605,7 +605,7 @@ static int lapic_resume(struct sys_device *dev) if (!apic_pm_state.active) return 0; - maxlvt = get_maxlvt(); + maxlvt = lapic_get_maxlvt(); local_irq_save(flags); rdmsr(MSR_IA32_APICBASE, l, h); |