Merge /spare/repo/linux-2.6/

5 files changed, 21 insertions, 13 deletions

diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index 1bff03f36965..ead6122dd06d 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o
 obj-$(CONFIG_PCI_DIRECT)        += direct.o
 
 pci-y                           := fixup.o
-pci-$(CONFIG_ACPI_PCI)          += acpi.o
+pci-$(CONFIG_ACPI)              += acpi.o
 pci-y                           += legacy.o irq.o
 
 pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
diff --git a/arch/i386/pci/acpi.c b/arch/i386/pci/acpi.c
index 42913f43feb0..2941674f35eb 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -3,16 +3,31 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/hw_irq.h>
+#include <asm/numa.h>
 #include "pci.h"
 
 struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
 {
+        struct pci_bus *bus;
+
         if (domain != 0) {
                 printk(KERN_WARNING "PCI: Multiple domains not supported\n");
                 return NULL;
         }
 
-        return pcibios_scan_root(busnum);
+        bus = pcibios_scan_root(busnum);
+#ifdef CONFIG_ACPI_NUMA
+        if (bus != NULL) {
+                int pxm = acpi_get_pxm(device->handle);
+                if (pxm >= 0) {
+                        bus->sysdata = (void *)(unsigned long)pxm_to_node(pxm);
+                        printk("bus %d -> pxm %d -> node %ld\n",
+                                busnum, pxm, (long)(bus->sysdata));
+                }
+        }
+#endif
+        
+        return bus;
 }
 
 extern int pci_routeirq;
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 3cc480998a47..6d6338500c3c 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -283,9 +283,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         /* Write-combine setting is ignored, it is changed via the mtrr
          * interfaces on this platform.
          */
-        if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                             vma->vm_end - vma->vm_start,
-                             vma->vm_page_prot))
+        if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                               vma->vm_end - vma->vm_start,
+                               vma->vm_page_prot))
                 return -EAGAIN;
 
         return 0;
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 86348b68fda1..326a2edc3834 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1075,7 +1075,7 @@ static void pirq_penalize_isa_irq(int irq, int active)
 
 void pcibios_penalize_isa_irq(int irq, int active)
 {
-#ifdef CONFIG_ACPI_PCI
+#ifdef CONFIG_ACPI
         if (!acpi_noirq)
                 acpi_penalize_isa_irq(irq, active);
         else
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 60f0e7a1162a..dfbf80cff834 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -127,13 +127,6 @@ static int __init pci_mmcfg_init(void)
             (pci_mmcfg_config[0].base_address == 0))
                 goto out;
 
-        /* Kludge for now. Don't use mmconfig on AMD systems because
-           those have some busses where mmconfig doesn't work,
-           and we don't parse ACPI MCFG well enough to handle that. 
-           Remove when proper handling is added. */
-        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-                goto out; 
-
         printk(KERN_INFO "PCI: Using MMCONFIG\n");
         raw_pci_ops = &pci_mmcfg;
         pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;