Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86, pci, mrst: Add extra sanity check in walking the PCI extended cap chain
  x86: Fix x2apic preenabled system with kexec
  x86: Force HPET readback_cmp for all ATI chipsets

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
index 7ef3a2735df3..cb29191cee58 100644
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
@@ -66,8 +66,9 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)
                                           devfn, pos, 4, &pcie_cap))
                         return 0;
 
-                if (pcie_cap == 0xffffffff)
-                        return 0;
+                if (PCI_EXT_CAP_ID(pcie_cap) == 0x0000 ||
+                        PCI_EXT_CAP_ID(pcie_cap) == 0xffff)
+                        break;
 
                 if (PCI_EXT_CAP_ID(pcie_cap) == PCI_EXT_CAP_ID_VNDR) {
                         raw_pci_ext_ops->read(pci_domain_nr(bus), bus->number,
@@ -76,7 +77,7 @@ static int fixed_bar_cap(struct pci_bus *bus, unsigned int devfn)
                                 return pos;
                 }
 
-                pos = pcie_cap >> 20;
+                pos = PCI_EXT_CAP_NEXT(pcie_cap);
         }
 
         return 0;