summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2011-08-02 17:48:38 +0200
committerSekhar Nori <nsekhar@ti.com>2011-09-07 17:22:12 +0530
commit897a6a1a14837d6d582bfd1fd7aba00be44b6469 (patch)
tree7130d3bfc68fa0bff0955ca4d7f6a9fa40a64a41 /arch
parentc08748005d56084a205f5c5db5f211b07a97a9be (diff)
downloadlinux-stable-897a6a1a14837d6d582bfd1fd7aba00be44b6469.tar.gz
linux-stable-897a6a1a14837d6d582bfd1fd7aba00be44b6469.tar.bz2
linux-stable-897a6a1a14837d6d582bfd1fd7aba00be44b6469.zip
ARM: davinci: fix cache flush build error
The TNET variant of DaVinci compiles some code that it shares with other DaVinci variants, however it has a V6 CPU rather than an ARM926T, thus the hardcoded call to arm926_flush_kern_cache_all() in sleep.S will obviously fail, and we need to build with the v6_flush_kern_cache_all() call instead. This was triggered by manually altering the DaVinci config to build the TNET version. Cc: Dave Martin <dave.martin@linaro.org> Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Sekhar Nori <nsekhar@ti.com> Cc: stable@kernel.org
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-davinci/sleep.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/sleep.S b/arch/arm/mach-davinci/sleep.S
index fb5e72b532b0..5f1e045a3ad1 100644
--- a/arch/arm/mach-davinci/sleep.S
+++ b/arch/arm/mach-davinci/sleep.S
@@ -217,7 +217,11 @@ ddr2clk_stop_done:
ENDPROC(davinci_ddr_psc_config)
CACHE_FLUSH:
- .word arm926_flush_kern_cache_all
+#ifdef CONFIG_CPU_V6
+ .word v6_flush_kern_cache_all
+#else
+ .word arm926_flush_kern_cache_all
+#endif
ENTRY(davinci_cpu_suspend_sz)
.word . - davinci_cpu_suspend