From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 18 May 2010 16:27:49 +0000 (-0700)
Subject: Merge branch 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.35-rc1~509
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=96fbeb973a7e17594a429537201611ca0b395622;hp=-c

Merge branch 'x86-mrst-for-linus' of git://git./linux/kernel/git/tip/linux-2.6-tip

* 'x86-mrst-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, mrst: add nop functions to x86_init mpparse functions
  x86, mrst, pci: return 0 for non-present pci bars
  x86: Avoid check hlt for newer cpus
---

96fbeb973a7e17594a429537201611ca0b395622
diff --combined arch/x86/pci/mrst.c
index 1cdc02cf8fa4,d5c7aefe56ff..7ef3a2735df3
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
@@@ -109,7 -109,7 +109,7 @@@ static int pci_device_update_fixed(stru
  			decode++;
  			decode = ~(decode - 1);
  		} else {
- 			decode = ~0;
+ 			decode = 0;
  		}
  
  		/*
@@@ -247,10 -247,6 +247,10 @@@ static void __devinit pci_fixed_bar_fix
  	u32 size;
  	int i;
  
 +	/* Must have extended configuration space */
 +	if (dev->cfg_size < PCIE_CAP_OFFSET + 4)
 +		return;
 +
  	/* Fixup the BAR sizes for fixed BAR devices and make them unmoveable */
  	offset = fixed_bar_cap(dev->bus, dev->devfn);
  	if (!offset || PCI_DEVFN(2, 0) == dev->devfn ||