Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 37e650c7 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: rename get_maxlvt to lapic_get_maxlvt 



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

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent cff90dbf

arch/x86/kernel/apic_64.c

+6 −6
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/io_apic_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/kernel/smpboot_64.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

include/asm-x86/apic_64.h

+1 −1
Original line number Diff line number Diff line
@@ -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);