x86: rename get_maxlvt to lapic_get_maxlvt

Use the same name for the 32 and 64 bit variant.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index fa6cdee6d303a9dbd29b9f198fd2742140ebc0d8..dfeda91fa80c69182de07003e8b737a06422d69f 100644 (file)
--- 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);

diff --git a/arch/x86/kernel/io_apic_64.c b/arch/x86/kernel/io_apic_64.c
index 23a3ac06a23ea1dc68d6d79f6cf7eb3f9f215f96..d4f5286101a92db04ef429df23a8f819cc92be76 100644 (file)
--- a/arch/x86/kernel/io_apic_64.c
+++ b/arch/x86/kernel/io_apic_64.c
@@ -1069,7 +1069,7 @@ void __apicdebuginit print_local_APIC(void * dummy)
        v = apic_read(APIC_LVR);
        printk(KERN_INFO "... APIC VERSION: %08x\n", v);
        ver = GET_APIC_VERSION(v);
-       maxlvt = get_maxlvt();
+       maxlvt = lapic_get_maxlvt();
 
        v = apic_read(APIC_TASKPRI);
        printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n", v, v & APIC_TPRI_MASK);

diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index aaf4e1291217ef120d98cb3d7d98e55dd0debb79..8147b7d4db63528cbd7c9c025ff63be8e60790cd 100644 (file)
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -466,7 +466,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
         */
        Dprintk("#startup loops: %d.\n", num_starts);
 
-       maxlvt = get_maxlvt();
+       maxlvt = lapic_get_maxlvt();
 
        for (j = 1; j <= num_starts; j++) {
                Dprintk("Sending STARTUP #%d.\n",j);

diff --git a/include/asm-x86/apic_64.h b/include/asm-x86/apic_64.h
index 9a0ec02a49a14bf6c061beaad78b056c9de75af5..b5f850f25114f36dd698c8b3dce36a3b991c1b2d 100644 (file)
--- a/include/asm-x86/apic_64.h
+++ b/include/asm-x86/apic_64.h
@@ -64,7 +64,7 @@ static inline void ack_APIC_irq(void)
        apic_write(APIC_EOI, 0);
 }
 
-extern int get_maxlvt(void);
+extern int lapic_get_maxlvt(void);
 extern void clear_local_APIC(void);
 extern void connect_bsp_APIC(void);
 extern void disconnect_bsp_APIC(int virt_wire_setup);