• Linus Torvalds's avatar
    Merge branch 'for-linus' of... · 5f78e4d3
    Linus Torvalds authored
    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-bigbox-pci:
      x86: add pci=check_enable_amd_mmconf and dmi check
      x86: work around io allocation overlap of HT links
      acpi: get boot_cpu_id as early for k8_scan_nodes
      x86_64: don't need set default res if only have one root bus
      x86: double check the multi root bus with fam10h mmconf
      x86: multi pci root bus with different io resource range, on 64-bit
      x86: use bus conf in NB conf fun1 to get bus range on, on 64-bit
      x86: get mp_bus_to_node early
      x86 pci: remove checking type for mmconfig probe
      x86: remove unneeded check in mmconf reject
      driver core: try parent numa_node at first before using default
      x86: seperate mmconf for fam10h out from setup_64.c
      x86: if acpi=off, force setting the mmconf for fam10h
      x86_64: check MSR to get MMCONFIG for AMD Family 10h
      x86_64: check and enable MMCONFIG for AMD Family 10h
      x86_64: set cfg_size for AMD Family 10h in case MMCONFIG
      x86: mmconf enable mcfg early
      x86: clear pci_mmcfg_virt when mmcfg get rejected
      x86: validate against acpi motherboard resources
    
    Fixed up fairly trivial conflicts in arch/x86/pci/{init.c,pci.h} due to
    OLPC support manually.
    5f78e4d3
pci.h 3.78 KB