Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86

* git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: (890 commits)
  x86: fix nodemap_size according to nodeid bits
  x86: fix overlap between pagetable with bss section
  x86: add PCI IDs to k8topology_64.c
  x86: fix early_ioremap pagetable ops
  x86: use the same pgd_list for PAE and 64-bit
  x86: defer cr3 reload when doing pud_clear()
  x86: early boot debugging via FireWire (ohci1394_dma=early)
  x86: don't special-case pmd allocations as much
  x86: shrink some ifdefs in fault.c
  x86: ignore spurious faults
  x86: remove nx_enabled from fault.c
  x86: unify fault_32|64.c
  x86: unify fault_32|64.c with ifdefs
  x86: unify fault_32|64.c by ifdef'd function bodies
  x86: arch/x86/mm/init_32.c printk fixes
  x86: arch/x86/mm/init_32.c cleanup
  x86: arch/x86/mm/init_64.c printk fixes
  x86: unify ioremap
  x86: fixes some bugs about EFI memory map handling
  x86: use reboot_type on EFI 32
  ...

1 files changed, 13 insertions, 10 deletions

diff --git a/arch/x86/kernel/cpu/mcheck/p6.c b/arch/x86/kernel/cpu/mcheck/p6.c
index deeae42ce199..74342604d30e 100644
--- a/arch/x86/kernel/cpu/mcheck/p6.c
+++ b/arch/x86/kernel/cpu/mcheck/p6.c
@@ -16,7 +16,7 @@
 #include "mce.h"
 
 /* Machine Check Handler For PII/PIII */
-static fastcall void intel_machine_check(struct pt_regs * regs, long error_code)
+static void intel_machine_check(struct pt_regs * regs, long error_code)
 {
         int recover=1;
         u32 alow, ahigh, high, low;
@@ -27,27 +27,30 @@ static fastcall void intel_machine_check(struct pt_regs * regs, long error_code)
         if (mcgstl & (1<<0))    /* Recoverable ? */
                 recover=0;
 
-        printk (KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
+        printk(KERN_EMERG "CPU %d: Machine Check Exception: %08x%08x\n",
                 smp_processor_id(), mcgsth, mcgstl);
 
-        for (i=0; i<nr_mce_banks; i++) {
-                rdmsr (MSR_IA32_MC0_STATUS+i*4,low, high);
+        for (i = 0; i < nr_mce_banks; i++) {
+                rdmsr(MSR_IA32_MC0_STATUS+i*4, low, high);
                 if (high & (1<<31)) {
+                        char misc[20];
+                        char addr[24];
+                        misc[0] = addr[0] = '\0';
                         if (high & (1<<29))
                                 recover |= 1;
                         if (high & (1<<25))
                                 recover |= 2;
-                        printk (KERN_EMERG "Bank %d: %08x%08x", i, high, low);
                         high &= ~(1<<31);
                         if (high & (1<<27)) {
-                                rdmsr (MSR_IA32_MC0_MISC+i*4, alow, ahigh);
-                                printk ("[%08x%08x]", ahigh, alow);
+                                rdmsr(MSR_IA32_MC0_MISC+i*4, alow, ahigh);
+                                snprintf(misc, 20, "[%08x%08x]", ahigh, alow);
                         }
                         if (high & (1<<26)) {
-                                rdmsr (MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
-                                printk (" at %08x%08x", ahigh, alow);
+                                rdmsr(MSR_IA32_MC0_ADDR+i*4, alow, ahigh);
+                                snprintf(addr, 24, " at %08x%08x", ahigh, alow);
                         }
-                        printk ("\n");
+                        printk(KERN_EMERG "CPU %d: Bank %d: %08x%08x%s%s\n",
+                                smp_processor_id(), i, high, low, misc, addr);
                 }
         }