From: Lennert Buytenhek <buytenh@wantstofly.org>
Date: Wed, 6 Dec 2006 22:11:33 +0000 (+0100)
Subject: [ARM] 3994/1: ixp23xx: fix handling of pci master aborts
X-Git-Tag: v2.6.20-rc1~34^2~412^2~1^2^3~11
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46156e04def20749c46efd8fc40e3527eae97b49;p=linux-2.6

[ARM] 3994/1: ixp23xx: fix handling of pci master aborts

The PCI master abort handling issue that affected ixp2000 also
affects ixp23xx.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-ixp23xx/pci.c b/arch/arm/mach-ixp23xx/pci.c
index 3b34fa35e3..ac7d43d23c 100644
--- a/arch/arm/mach-ixp23xx/pci.c
+++ b/arch/arm/mach-ixp23xx/pci.c
@@ -36,7 +36,7 @@
 
 extern int (*external_fault) (unsigned long, struct pt_regs *);
 
-static int pci_master_aborts = 0;
+static volatile int pci_master_aborts = 0;
 
 #ifdef DEBUG
 #define DBG(x...)	printk(x)