diff options
author | Tom Rini <trini@kernel.crashing.org> | 2005-04-16 18:24:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:24:25 -0400 |
commit | ef2f3253f061cbb86da25411a6e6e6a69a84b6ac (patch) | |
tree | 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714 /arch/ppc/platforms | |
parent | 54095a6ec7b11a008c07c5016b025206a051f560 (diff) |
[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')
-rw-r--r-- | arch/ppc/platforms/pmac_cache.S | 4 |
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 @@ | |||
28 | */ | 28 | */ |
29 | 29 | ||
30 | _GLOBAL(flush_disable_caches) | 30 | _GLOBAL(flush_disable_caches) |
31 | #ifndef CONFIG_6xx | ||
32 | blr | ||
33 | #else | ||
31 | BEGIN_FTR_SECTION | 34 | BEGIN_FTR_SECTION |
32 | b flush_disable_745x | 35 | b flush_disable_745x |
33 | END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450) | 36 | END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450) |
@@ -323,3 +326,4 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR) | |||
323 | mtmsr r11 /* restore DR and EE */ | 326 | mtmsr r11 /* restore DR and EE */ |
324 | isync | 327 | isync |
325 | blr | 328 | blr |
329 | #endif /* CONFIG_6xx */ | ||