summaryrefslogtreecommitdiffstats
path: root/include/asm-mips/edac.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-27 09:42:43 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-27 09:42:43 -0700
commit88ede8209efd01b4a557ddd588875544954e170a (patch)
treefaa926f325a2c6c04a48793cf734502c8a078ea1 /include/asm-mips/edac.h
parent96665822dc43957d4337509e138017dc1cb960b1 (diff)
parent23dd6d351a2f8157602e854e3a147a04cf7279a1 (diff)
downloadop-kernel-dev-88ede8209efd01b4a557ddd588875544954e170a.zip
op-kernel-dev-88ede8209efd01b4a557ddd588875544954e170a.tar.gz
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: (60 commits) [MIPS] Fulong doesn't need ISA DMA. [MIPS] IP27: intr_sconnect_level: don't disable interrupts. [MIPS] IP27: startup_bridge_irq: connect interrupt. [MIPS] IP27: shutdown_bridge_irq: don't free irq. [MIPS] Sort out handling of ISA-less PCI systems. [MIPS] Add __cmpdi2 [MIPS] HOTPLUG: Make register_pci_controller __devinit. [MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus. [MIPS] PCI: Remove __devinit attribute from pcibios_fixup_bus. [MIPS] Delete duplicate inclusion of <linux/delay.h>. [MIPS] Polish <asm/edac.h>. [MIPS] IP22: Export sgi_gfxaddr for use by the Newport console driver. [MIPS] Maintain si_code field properly for FP exceptions [MIPS] SMTC: Fix duplicate status dumps on NMI [MIPS] Unconditionally writeback and invalidate caches on kexec. [PATCH] rtc: Make rtc-rs5c348 driver hotplug-aware [MIPS] Fix gcc 3.3 warning. [MIPS] Fix invalid semicolon after if statement [MIPS] Update Cobalt defconfig [MIPS] Update workpad_defconfig ...
Diffstat (limited to 'include/asm-mips/edac.h')
-rw-r--r--include/asm-mips/edac.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/include/asm-mips/edac.h b/include/asm-mips/edac.h
index 83719ee..4da0c1f 100644
--- a/include/asm-mips/edac.h
+++ b/include/asm-mips/edac.h
@@ -9,8 +9,7 @@ static inline void atomic_scrub(void *va, u32 size)
unsigned long temp;
u32 i;
- for (i = 0; i < size / sizeof(unsigned long); i++, virt_addr++) {
-
+ for (i = 0; i < size / sizeof(unsigned long); i++) {
/*
* Very carefully read and write to memory atomically
* so we are interrupt, DMA and SMP safe.
@@ -19,16 +18,16 @@ static inline void atomic_scrub(void *va, u32 size)
*/
__asm__ __volatile__ (
- " .set mips3 \n"
- "1: ll %0, %1 # atomic_add \n"
- " ll %0, %1 # atomic_add \n"
- " addu %0, $0 \n"
- " sc %0, %1 \n"
- " beqz %0, 1b \n"
- " .set mips0 \n"
+ " .set mips2 \n"
+ "1: ll %0, %1 # atomic_scrub \n"
+ " addu %0, $0 \n"
+ " sc %0, %1 \n"
+ " beqz %0, 1b \n"
+ " .set mips0 \n"
: "=&r" (temp), "=m" (*virt_addr)
: "m" (*virt_addr));
+ virt_addr++;
}
}
OpenPOWER on IntegriCloud