acpi.c (87e8b821ed8db3dab03d96cd542e29666bf210aa) | acpi.c (57283776b2b821ba4d592f61cad04d0293412740) |
---|---|
1#include <linux/pci.h> 2#include <linux/acpi.h> 3#include <linux/init.h> 4#include <linux/irq.h> 5#include <linux/dmi.h> 6#include <asm/numa.h> 7#include <asm/pci_x86.h> 8 --- 215 unchanged lines hidden (view full) --- 224 return; 225 226name_alloc_fail: 227 kfree(info.res); 228res_alloc_fail: 229 return; 230} 231 | 1#include <linux/pci.h> 2#include <linux/acpi.h> 3#include <linux/init.h> 4#include <linux/irq.h> 5#include <linux/dmi.h> 6#include <asm/numa.h> 7#include <asm/pci_x86.h> 8 --- 215 unchanged lines hidden (view full) --- 224 return; 225 226name_alloc_fail: 227 kfree(info.res); 228res_alloc_fail: 229 return; 230} 231 |
232struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum) | 232struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_pci_root *root) |
233{ | 233{ |
234 struct acpi_device *device = root->device; 235 int domain = root->segment; 236 int busnum = root->secondary.start; |
|
234 struct pci_bus *bus; 235 struct pci_sysdata *sd; 236 int node; 237#ifdef CONFIG_ACPI_NUMA 238 int pxm; 239#endif 240 241 if (domain && !pci_domains_supported) { --- 95 unchanged lines hidden --- | 237 struct pci_bus *bus; 238 struct pci_sysdata *sd; 239 int node; 240#ifdef CONFIG_ACPI_NUMA 241 int pxm; 242#endif 243 244 if (domain && !pci_domains_supported) { --- 95 unchanged lines hidden --- |