summaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorChristoph Lameter <christoph@lameter.com>2005-05-17 08:48:16 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-17 09:27:05 -0700
commitff0d2f90fdc4b564d47a7c26b16de81a16cfa28e (patch)
tree6bb5a1cf91bbda8308ec7e6d900cb89071907dcd /arch/i386
parent8c41a5f50deab01aca11155154d7e6737b3a1d9f (diff)
downloadop-kernel-dev-ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e.zip
op-kernel-dev-ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e.tar.gz
[PATCH] fix memory scribble in arch/i386/pci/fixup.c
The GET_INDEX() macro should use just the low three bits of the devfn, otherwise we have a memory scribble in pcie_rootport_aspm_quirk that overwrites ptype_all Fix it to be more careful about its arguments while at it. Acked by Dely Sy <dely.l.sy@intel.com> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/pci/fixup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index be52c5a..8e8e895 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -253,7 +253,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_NFORCE2, pci
#define MAX_PCIEROOT 6
static int quirk_aspm_offset[MAX_PCIEROOT << 3];
-#define GET_INDEX(a, b) (((a - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + b)
+#define GET_INDEX(a, b) ((((a) - PCI_DEVICE_ID_INTEL_MCH_PA) << 3) + ((b) & 7))
static int quirk_pcie_aspm_read(struct pci_bus *bus, unsigned int devfn, int where, int size, u32 *value)
{
OpenPOWER on IntegriCloud