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

Commit 64883ab0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Ingo Molnar
Browse files

x86: cleanup mpspec variants 



Bring the mpspec variants into sync to prepare merging and
paravirt support.

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

arch/x86/kernel/mpparse_32.c

+9 −9
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ static void __init MP_ioapic_info (struct mpc_config_ioapic *m) 
	if (!(m->mpc_flags & MPC_APIC_USABLE))

		return;



	printk(KERN_INFO "I/O APIC #%d Version %d at 0x%lX.\n",

	printk(KERN_INFO "I/O APIC #%d Version %d at 0x%X.\n",

		m->mpc_apicid, m->mpc_apicver, m->mpc_apicaddr);

	if (nr_ioapics >= MAX_IO_APICS) {

		printk(KERN_CRIT "Max # of I/O APICs (%d) exceeded (found %d).\n",
@@ -405,7 +405,7 @@ static int __init smp_read_mpc(struct mp_config_table *mpc) 


	mps_oem_check(mpc, oem, str);



	printk("APIC at: 0x%lX\n",mpc->mpc_lapic);

	printk("APIC at: 0x%X\n", mpc->mpc_lapic);



	/*

	 * Save the local APIC address (it might be non-default) -- but only
@@ -921,7 +921,7 @@ void __init mp_register_ioapic(u8 id, u32 address, u32 gsi_base) 
	mp_ioapic_routing[idx].gsi_end = gsi_base +

		io_apic_get_redir_entries(idx);



	printk("IOAPIC[%d]: apic_id %d, version %d, address 0x%lx, "

	printk("IOAPIC[%d]: apic_id %d, version %d, address 0x%x, "

	       "GSI %d-%d\n", idx, mp_ioapics[idx].mpc_apicid,

	       mp_ioapics[idx].mpc_apicver, mp_ioapics[idx].mpc_apicaddr,

	       mp_ioapic_routing[idx].gsi_base,

arch/x86/mach-visws/mpparse.c

+8 −8
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ static void __init MP_processor_info (struct mpc_config_processor *m) 
		return;



	logical_apicid = m->mpc_apicid;

	printk(KERN_INFO "%sCPU #%d %ld:%ld APIC version %d\n",

	printk(KERN_INFO "%sCPU #%d %u:%u APIC version %d\n",

	       m->mpc_cpuflag & CPU_BOOTPROCESSOR ? "Bootup " : "",

	       m->mpc_apicid,

	       (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,

include/asm-x86/mach-bigsmp/mach_apic.h

+6 −6
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static inline int cpu_to_logical_apicid(int cpu) 
static inline int mpc_apic_id(struct mpc_config_processor *m,

			      struct mpc_config_translation *translation_record)

{

	printk("Processor #%d %ld:%ld APIC version %d\n",

	printk("Processor #%d %u:%u APIC version %d\n",

	       m->mpc_apicid,

	       (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,

	       (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,

include/asm-x86/mach-default/mach_apic.h

+9 −9
Original line number Diff line number Diff line
@@ -92,12 +92,12 @@ static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) 
static inline int mpc_apic_id(struct mpc_config_processor *m,

			      struct mpc_config_translation *translation_record)

{

	printk("Processor #%d %ld:%ld APIC version %d\n",

	printk("Processor #%d %u:%u APIC version %d\n",

	       m->mpc_apicid,

	       (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,

	       (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,

	       m->mpc_apicver);

	return (m->mpc_apicid);

	return m->mpc_apicid;

}



static inline void setup_portio_remap(void)

include/asm-x86/mach-es7000/mach_apic.h

+5 −5
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static inline int cpu_to_logical_apicid(int cpu) 


static inline int mpc_apic_id(struct mpc_config_processor *m, struct mpc_config_translation *unused)

{

	printk("Processor #%d %ld:%ld APIC version %d\n",

	printk("Processor #%d %u:%u APIC version %d\n",

	       m->mpc_apicid,

	       (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,

	       (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,