x86: cleanup mpspec variants

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

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

2 files changed, 17 insertions, 17 deletions

diff --git a/arch/x86/kernel/mpparse_32.c b/arch/x86/kernel/mpparse_32.c
index 7a05a7f6099a..22fc8d7dec11 100644
--- a/arch/x86/kernel/mpparse_32.c
+++ b/arch/x86/kernel/mpparse_32.c
@@ -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,9 +405,9 @@ 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
          * if we're not using ACPI.
          */
@@ -918,14 +918,14 @@ void __init mp_register_ioapic(u8 id, u32 address, u32 gsi_base)
          */
         mp_ioapic_routing[idx].apic_id = mp_ioapics[idx].mpc_apicid;
         mp_ioapic_routing[idx].gsi_base = gsi_base;
-        mp_ioapic_routing[idx].gsi_end = 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, "
-                "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,
-                mp_ioapic_routing[idx].gsi_end);
+        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,
+               mp_ioapic_routing[idx].gsi_end);
 }
 
 void __init
diff --git a/arch/x86/mach-visws/mpparse.c b/arch/x86/mach-visws/mpparse.c
index f3c74fab8b95..2a8456a1f44f 100644
--- a/arch/x86/mach-visws/mpparse.c
+++ b/arch/x86/mach-visws/mpparse.c
@@ -36,19 +36,19 @@ unsigned int __initdata maxcpus = NR_CPUS;
 
 static void __init MP_processor_info (struct mpc_config_processor *m)
 {
-        int ver, logical_apicid;
+        int ver, logical_apicid;
         physid_mask_t apic_cpus;
-        
+
         if (!(m->mpc_cpuflag & CPU_ENABLED))
                 return;
 
         logical_apicid = m->mpc_apicid;
-        printk(KERN_INFO "%sCPU #%d %ld:%ld APIC version %d\n",
-                m->mpc_cpuflag & CPU_BOOTPROCESSOR ? "Bootup " : "",
-                m->mpc_apicid,
-                (m->mpc_cpufeature & CPU_FAMILY_MASK) >> 8,
-                (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
-                m->mpc_apicver);
+        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,
+               (m->mpc_cpufeature & CPU_MODEL_MASK) >> 4,
+               m->mpc_apicver);
 
         if (m->mpc_cpuflag & CPU_BOOTPROCESSOR)
                 boot_cpu_physical_apicid = m->mpc_apicid;