aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc/platforms/pmac_cache.S
diff options
context:
space:
mode:
authorTom Rini <trini@kernel.crashing.org>2005-04-16 15:24:25 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:24:25 -0700
commitef2f3253f061cbb86da25411a6e6e6a69a84b6ac (patch)
tree4cc7f6529b1a50a862c8b5c02c05a1ca0a371714 /arch/ppc/platforms/pmac_cache.S
parent[PATCH] ppc32: Fix a problem with NTP on !(chrp||gemini) (diff)
downloadlinux-dev-ef2f3253f061cbb86da25411a6e6e6a69a84b6ac.tar.xz
linux-dev-ef2f3253f061cbb86da25411a6e6e6a69a84b6ac.zip
[PATCH] ppc32: Fix building 32bit kernel for 64bit machines
When building a ppc32 MULTIPLATFORM kernel for a 64bit pmac, we try and build certain files or use certain functions that make no sense in that context. This catches the last of these. Signed-off-by: Tom Rini <trini@kernel.crashing.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc/platforms/pmac_cache.S')
-rw-r--r--arch/ppc/platforms/pmac_cache.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/ppc/platforms/pmac_cache.S b/arch/ppc/platforms/pmac_cache.S
index c00e0352044d..da34a9bc9299 100644
--- a/arch/ppc/platforms/pmac_cache.S
+++ b/arch/ppc/platforms/pmac_cache.S
@@ -28,6 +28,9 @@
*/
_GLOBAL(flush_disable_caches)
+#ifndef CONFIG_6xx
+ blr
+#else
BEGIN_FTR_SECTION
b flush_disable_745x
END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
@@ -323,3 +326,4 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR)
mtmsr r11 /* restore DR and EE */
isync
blr
+#endif /* CONFIG_6xx */