summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-11-06 18:04:23 +0000
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-11-06 18:04:23 +0000
commit878708f290f6ed8b108d73fd6ab624cda6266a1e (patch)
tree249f991f231ef8532c7f44b592bbfe78194f7e2e /arch
parentb1cce6b1b2785fd61454b47ceacb461815407662 (diff)
parentc7cf72dcadbe39c2077b32460f86c9f8167be3be (diff)
downloadlinux-3.10-878708f290f6ed8b108d73fd6ab624cda6266a1e.tar.gz
linux-3.10-878708f290f6ed8b108d73fd6ab624cda6266a1e.tar.bz2
linux-3.10-878708f290f6ed8b108d73fd6ab624cda6266a1e.zip
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/xscaleiop
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mm/cache-xsc3l2.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/cache-xsc3l2.c b/arch/arm/mm/cache-xsc3l2.c
index 10b1bae1a25..464de893a98 100644
--- a/arch/arm/mm/cache-xsc3l2.c
+++ b/arch/arm/mm/cache-xsc3l2.c
@@ -98,7 +98,7 @@ static void xsc3_l2_inv_range(unsigned long start, unsigned long end)
/*
* Clean and invalidate partial last cache line.
*/
- if (end & (CACHE_LINE_SIZE - 1)) {
+ if (start < end && (end & (CACHE_LINE_SIZE - 1))) {
xsc3_l2_clean_pa(end & ~(CACHE_LINE_SIZE - 1));
xsc3_l2_inv_pa(end & ~(CACHE_LINE_SIZE - 1));
end &= ~(CACHE_LINE_SIZE - 1);
@@ -107,7 +107,7 @@ static void xsc3_l2_inv_range(unsigned long start, unsigned long end)
/*
* Invalidate all full cache lines between 'start' and 'end'.
*/
- while (start != end) {
+ while (start < end) {
xsc3_l2_inv_pa(start);
start += CACHE_LINE_SIZE;
}