summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-ixp2000/pci.c
diff options
context:
space:
mode:
authorLennert Buytenhek2006-12-01 16:02:40 +0100
committerRussell King2006-12-01 17:55:22 +0100
commit2024c39dbba4d036f0b16daf530ad5f4416fb344 (patch)
treea7f0336412df5e2afc9f68ea1cf2610d586bbaec /arch/arm/mach-ixp2000/pci.c
parent[ARM] Fix Versatile PB initialisation to use .init_machine (diff)
downloadkernel-qcow2-linux-2024c39dbba4d036f0b16daf530ad5f4416fb344.tar.gz
kernel-qcow2-linux-2024c39dbba4d036f0b16daf530ad5f4416fb344.tar.xz
kernel-qcow2-linux-2024c39dbba4d036f0b16daf530ad5f4416fb344.zip
[ARM] 3965/1: ixp2000: fix handling of pci master aborts
The master abort check in ixp2000_pci_read_config() recently started failing due to the compiler optimising out the read access following the clearing of pci_master_aborts. Mark pci_master_aborts volatile to force the compiler to reload it on every use. Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-ixp2000/pci.c')
-rw-r--r--arch/arm/mach-ixp2000/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/pci.c b/arch/arm/mach-ixp2000/pci.c
index d4bf1e1c0031..5a09a90c08fb 100644
--- a/arch/arm/mach-ixp2000/pci.c
+++ b/arch/arm/mach-ixp2000/pci.c
@@ -32,7 +32,7 @@
#include <asm/mach/pci.h>
-static int pci_master_aborts = 0;
+static volatile int pci_master_aborts = 0;
static int clear_master_aborts(void);