From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 29 Apr 2008 15:26:51 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux... 
X-Git-Tag: v2.6.26-rc1~369
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=5f78e4d33945b291d12765cdd7e4304f437b9361;p=~emulex%2Finfiniband.git

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.
---

5f78e4d33945b291d12765cdd7e4304f437b9361
diff --cc arch/x86/kernel/setup_64.c
index a94fb959a87,2f5c488aad0..22c14e21c97
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@@ -40,9 -41,9 +41,10 @@@
  #include <linux/dmi.h>
  #include <linux/dma-mapping.h>
  #include <linux/ctype.h>
+ #include <linux/sort.h>
  #include <linux/uaccess.h>
  #include <linux/init_ohci1394_dma.h>
 +#include <linux/kvm_para.h>
  
  #include <asm/mtrr.h>
  #include <asm/uaccess.h>
diff --cc arch/x86/pci/init.c
index 0f5f7dd2a62,343c36337e6..dd30c6076b5
--- a/arch/x86/pci/init.c
+++ b/arch/x86/pci/init.c
@@@ -6,19 -6,13 +6,17 @@@
     in the right sequence from here. */
  static __init int pci_access_init(void)
  {
- 	int type __maybe_unused = 0;
- 
  #ifdef CONFIG_PCI_DIRECT
+ 	int type = 0;
+ 
  	type = pci_direct_probe();
  #endif
- #ifdef CONFIG_PCI_MMCONFIG
- 	pci_mmcfg_init(type);
- #endif
++
+ 	pci_mmcfg_early_init();
+ 
 +#ifdef CONFIG_PCI_OLPC
 +	pci_olpc_init();
 +#endif
- 	if (raw_pci_ops)
- 		return 0;
  #ifdef CONFIG_PCI_BIOS
  	pci_pcbios_init();
  #endif
diff --cc arch/x86/pci/pci.h
index 7d84e813e95,8ef86b5c37c..c58805a92db
--- a/arch/x86/pci/pci.h
+++ b/arch/x86/pci/pci.h
@@@ -97,8 -98,6 +98,7 @@@ extern struct pci_raw_ops pci_direct_co
  extern int pci_direct_probe(void);
  extern void pci_direct_init(int type);
  extern void pci_pcbios_init(void);
- extern void pci_mmcfg_init(int type);
 +extern void pci_olpc_init(void);
  
  /* pci-mmconfig.c */