6 files changed, 17 insertions, 13 deletions

diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index f71fb4a029cb..b2751eadbc56 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -142,6 +142,7 @@ config X86_SUMMIT
           In particular, it is needed for the x440.
 
           If you don't have one of these computers, you should say N here.
+          If you want to build a NUMA kernel, you must select ACPI.
 
 config X86_BIGSMP
         bool "Support for other sub-arch SMP systems with more than 8 CPUs"
@@ -169,6 +170,7 @@ config X86_GENERICARCH
        help
           This option compiles in the Summit, bigsmp, ES7000, default subarchitectures.
           It is intended for a generic binary kernel.
+          If you want a NUMA kernel, select ACPI.   We need SRAT for NUMA.
 
 config X86_ES7000
         bool "Support for Unisys ES7000 IA32 series"
@@ -542,7 +544,7 @@ config X86_PAE
 # Common NUMA Features
 config NUMA
         bool "Numa Memory Allocation and Scheduler Support"
-        depends on SMP && HIGHMEM64G && (X86_NUMAQ || X86_GENERICARCH || (X86_SUMMIT && ACPI))
+        depends on SMP && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI)
         default n if X86_PC
         default y if (X86_NUMAQ || X86_SUMMIT)
 
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 0db6387025ca..ee003bc0e8b1 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -59,7 +59,7 @@ static inline int gsi_irq_sharing(int gsi) { return gsi; }
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                 (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
-                ((acpi_table_entry_header *)entry)->length != sizeof(*entry))
+                ((acpi_table_entry_header *)entry)->length < sizeof(*entry))
 
 #define PREFIX                  "ACPI: "
 
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index 9f408eee4e6f..b781b38131c0 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -292,7 +292,10 @@ ENTRY(do_suspend_lowlevel)
         pushl   $3
         call    acpi_enter_sleep_state
         addl    $4, %esp
-        ret
+
+#       In case of S3 failure, we'll emerge here.  Jump
+#       to ret_point to recover
+        jmp     ret_point
         .p2align 4,,7
 ret_point:
         call    restore_registers
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index efb41e81351c..e6ea00edcb54 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -567,16 +567,11 @@ static struct cpufreq_driver acpi_cpufreq_driver = {
 static int __init
 acpi_cpufreq_init (void)
 {
-        int                     result = 0;
-
         dprintk("acpi_cpufreq_init\n");
 
-        result = acpi_cpufreq_early_init_acpi();
+        acpi_cpufreq_early_init_acpi();
 
-        if (!result)
-                result = cpufreq_register_driver(&acpi_cpufreq_driver);
-        
-        return (result);
+        return cpufreq_register_driver(&acpi_cpufreq_driver);
 }
 
 
diff --git a/arch/i386/pci/init.c b/arch/i386/pci/init.c
index c7650a7e0b07..51087a9d9172 100644
--- a/arch/i386/pci/init.c
+++ b/arch/i386/pci/init.c
@@ -14,8 +14,12 @@ static __init int pci_access_init(void)
 #ifdef CONFIG_PCI_BIOS
         pci_pcbios_init();
 #endif
-        if (raw_pci_ops)
-                return 0;
+        /*
+         * don't check for raw_pci_ops here because we want pcbios as last
+         * fallback, yet it's needed to run first to set pcibios_last_bus
+         * in case legacy PCI probing is used. otherwise detecting peer busses
+         * fails.
+         */
 #ifdef CONFIG_PCI_DIRECT
         pci_direct_init();
 #endif
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index e545b0992c48..972180f738d9 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -178,7 +178,7 @@ static __init void unreachable_devices(void)
                                 pci_exp_set_dev_base(addr, k, PCI_DEVFN(i, 0));
                         if (addr == 0 ||
                             readl((u32 __iomem *)mmcfg_virt_addr) != val1) {
-                                set_bit(i, fallback_slots);
+                                set_bit(i + 32*k, fallback_slots);
                                 printk(KERN_NOTICE
                         "PCI: No mmconfig possible on %x:%x\n", k, i);
                         }