5 files changed, 18 insertions, 17 deletions

diff --git a/arch/x86/include/asm/i387.h b/arch/x86/include/asm/i387.h
index ef328901c802..c9e09ea05644 100644
--- a/arch/x86/include/asm/i387.h
+++ b/arch/x86/include/asm/i387.h
@@ -237,7 +237,7 @@ static inline void fpu_save_init(struct fpu *fpu)
         } else if (use_fxsr()) {
                 fpu_fxsave(fpu);
         } else {
-                asm volatile("fsave %[fx]; fwait"
+                asm volatile("fnsave %[fx]; fwait"
                              : [fx] "=m" (fpu->state->fsave));
                 return;
         }
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 5a0484a95ad6..4be9b398470e 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -976,6 +976,11 @@ void __init setup_arch(char **cmdline_p)
         paging_init();
         x86_init.paging.pagetable_setup_done(swapper_pg_dir);
 
+        if (boot_cpu_data.cpuid_level >= 0) {
+                /* A CPU has %cr4 if and only if it has CPUID */
+                mmu_cr4_features = read_cr4();
+        }
+
 #ifdef CONFIG_X86_32
         /* sync back kernel address range */
         clone_pgd_range(initial_page_table + KERNEL_PGD_BOUNDARY,
diff --git a/arch/x86/mm/srat_32.c b/arch/x86/mm/srat_32.c
index 48651c6f657d..364f36bdfad8 100644
--- a/arch/x86/mm/srat_32.c
+++ b/arch/x86/mm/srat_32.c
@@ -211,10 +211,12 @@ int __init get_memcfg_from_srat(void)
 {
         int i, j, nid;
 
-
         if (srat_disabled())
                 goto out_fail;
 
+        if (acpi_numa_init() < 0)
+                goto out_fail;
+
         if (num_memory_chunks == 0) {
                 printk(KERN_DEBUG
                          "could not find any ACPI SRAT memory areas.\n");
diff --git a/arch/x86/platform/mrst/vrtc.c b/arch/x86/platform/mrst/vrtc.c
index 04cf645feb92..73d70d65e76e 100644
--- a/arch/x86/platform/mrst/vrtc.c
+++ b/arch/x86/platform/mrst/vrtc.c
@@ -100,9 +100,11 @@ int vrtc_set_mmss(unsigned long nowtime)
 
 void __init mrst_rtc_init(void)
 {
-        unsigned long vrtc_paddr = sfi_mrtc_array[0].phys_addr;
+        unsigned long vrtc_paddr;
 
         sfi_table_parse(SFI_SIG_MRTC, NULL, NULL, sfi_parse_mrtc);
+
+        vrtc_paddr = sfi_mrtc_array[0].phys_addr;
         if (!sfi_mrtc_num || !vrtc_paddr)
                 return;
 
diff --git a/arch/x86/platform/visws/visws_quirks.c b/arch/x86/platform/visws/visws_quirks.c
index fe4cf8294878..c7abf13a213f 100644
--- a/arch/x86/platform/visws/visws_quirks.c
+++ b/arch/x86/platform/visws/visws_quirks.c
@@ -471,15 +471,7 @@ static unsigned int startup_piix4_master_irq(struct irq_data *data)
 {
         legacy_pic->init(0);
         enable_cobalt_irq(data);
-}
-
-static void end_piix4_master_irq(struct irq_data *data)
-{
-        unsigned long flags;
-
-        spin_lock_irqsave(&cobalt_lock, flags);
-        enable_cobalt_irq(data);
-        spin_unlock_irqrestore(&cobalt_lock, flags);
+        return 0;
 }
 
 static struct irq_chip piix4_master_irq_type = {
@@ -492,7 +484,7 @@ static void pii4_mask(struct irq_data *data) { }
 
 static struct irq_chip piix4_virtual_irq_type = {
         .name           = "PIIX4-virtual",
-        .mask           = pii4_mask,
+        .irq_mask       = pii4_mask,
 };
 
 /*
@@ -580,9 +572,9 @@ static struct irqaction cascade_action = {
 
 static inline void set_piix4_virtual_irq_type(void)
 {
-        piix4_virtual_irq_type.enable = i8259A_chip.unmask;
-        piix4_virtual_irq_type.disable = i8259A_chip.mask;
-        piix4_virtual_irq_type.unmask = i8259A_chip.unmask;
+        piix4_virtual_irq_type.irq_enable = i8259A_chip.irq_unmask;
+        piix4_virtual_irq_type.irq_disable = i8259A_chip.irq_mask;
+        piix4_virtual_irq_type.irq_unmask = i8259A_chip.irq_unmask;
 }
 
 static void __init visws_pre_intr_init(void)
@@ -599,7 +591,7 @@ static void __init visws_pre_intr_init(void)
                 else if (i == CO_IRQ_IDE0)
                         chip = &cobalt_irq_type;
                 else if (i == CO_IRQ_IDE1)
-                        >chip = &cobalt_irq_type;
+                        chip = &cobalt_irq_type;
                 else if (i == CO_IRQ_8259)
                         chip = &piix4_master_irq_type;
                 else if (i < CO_IRQ_APIC0)