diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 11:23:16 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-12 11:23:16 +0200 |
commit | c1502e28346fd3b9955ce654c96212c4748d900d (patch) | |
tree | da0b2232b79343eacb243e3287bc4daed9a1726c /arch | |
parent | Do not replace whole memcpy in apply alternatives (diff) | |
download | linux-c1502e28346fd3b9955ce654c96212c4748d900d.tar.xz linux-c1502e28346fd3b9955ce654c96212c4748d900d.zip |
i386: Fix broken mmiocfg accesses
Commit 3320ad994afb2c44ad34b3b34c3c5cf0da297331 broke mmio config space
accesses totally on i386 - it dropped the "reg" offset to the address.
Cc: dean gaudet <dean@arctic.org>
Cc: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/i386/pci/mmconfig.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/pci/mmconfig.c b/arch/i386/pci/mmconfig.c index 0d46b7a88b3b..1bf5816d34c8 100644 --- a/arch/i386/pci/mmconfig.c +++ b/arch/i386/pci/mmconfig.c @@ -115,13 +115,13 @@ static int pci_mmcfg_write(unsigned int seg, unsigned int bus, switch (len) { case 1: - mmio_config_writeb(mmcfg_virt_addr, value); + mmio_config_writeb(mmcfg_virt_addr + reg, value); break; case 2: - mmio_config_writew(mmcfg_virt_addr, value); + mmio_config_writew(mmcfg_virt_addr + reg, value); break; case 4: - mmio_config_writel(mmcfg_virt_addr, value); + mmio_config_writel(mmcfg_virt_addr + reg, value); break; } spin_unlock_irqrestore(&pci_config_lock, flags); |