summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/io.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-21 15:44:34 +0900
commit4b4f887fb2780e39383c1f202b72f5a2780b2d4c (patch)
treee790d89c2612d2464ac00063dac677653f4ac9cb /arch/powerpc/kernel/io.c
parent6424db52e24e8cdf89917fa3c10395116440160e (diff)
parent76e7461a21dfe13565b2a323b53c8cc963541126 (diff)
downloadop-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.zip
op-kernel-dev-4b4f887fb2780e39383c1f202b72f5a2780b2d4c.tar.gz
Merge branch 'master' into sh/hw-breakpoints
Diffstat (limited to 'arch/powerpc/kernel/io.c')
-rw-r--r--arch/powerpc/kernel/io.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index 1882bf4..8dc7547 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -161,7 +161,7 @@ void _memcpy_fromio(void *dest, const volatile void __iomem *src,
dest++;
n--;
}
- while(n > 4) {
+ while(n >= 4) {
*((u32 *)dest) = *((volatile u32 *)vsrc);
eieio();
vsrc += 4;
@@ -190,7 +190,7 @@ void _memcpy_toio(volatile void __iomem *dest, const void *src, unsigned long n)
vdest++;
n--;
}
- while(n > 4) {
+ while(n >= 4) {
*((volatile u32 *)vdest) = *((volatile u32 *)src);
src += 4;
vdest += 4;
OpenPOWER on IntegriCloud