From: Paul Mundt Somewhere along the line dcache disabling decided it wanted to stop itself from compiling. So we fix it. Signed-off-by: Paul Mundt Signed-off-by: Andrew Morton --- 25-akpm/arch/sh64/mm/cache.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff -puN arch/sh64/mm/cache.c~sh64-beat-dcache-disabling-back-into-submission arch/sh64/mm/cache.c --- 25/arch/sh64/mm/cache.c~sh64-beat-dcache-disabling-back-into-submission 2005-03-07 20:41:27.000000000 -0800 +++ 25-akpm/arch/sh64/mm/cache.c 2005-03-07 20:41:27.000000000 -0800 @@ -114,6 +114,16 @@ int __init sh64_cache_init(void) return 0; } +#ifdef CONFIG_DCACHE_DISABLED +#define sh64_dcache_purge_all() do { } while (0) +#define sh64_dcache_purge_coloured_phy_page(paddr, eaddr) do { } while (0) +#define sh64_dcache_purge_user_range(mm, start, end) do { } while (0) +#define sh64_dcache_purge_phy_page(paddr) do { } while (0) +#define sh64_dcache_purge_virt_page(mm, eaddr) do { } while (0) +#define sh64_dcache_purge_kernel_range(start, end) do { } while (0) +#define sh64_dcache_wback_current_user_range(start, end) do { } while (0) +#endif + /*##########################################################################*/ /* From here onwards, a rewrite of the implementation, @@ -436,6 +446,7 @@ static void __inline__ sh64_dcache_purge eaddr1 = eaddr0 + cpu_data->dcache.way_ofs * cpu_data->dcache.ways; for (eaddr=eaddr0; eaddrdcache.way_ofs) { asm __volatile__ ("alloco %0, 0" : : "r" (eaddr)); + asm __volatile__ ("synco"); /* TAKum03020 */ } eaddr1 = eaddr0 + cpu_data->dcache.way_ofs * cpu_data->dcache.ways; @@ -741,8 +752,6 @@ static void sh64_dcache_wback_current_us } } -#endif /* !CONFIG_DCACHE_DISABLED */ - /****************************************************************************/ /* These *MUST* lie in an area of virtual address space that's otherwise unused. */ @@ -805,6 +814,8 @@ static void sh64_clear_user_page_coloure sh64_teardown_dtlb_cache_slot(); } +#endif /* !CONFIG_DCACHE_DISABLED */ + /****************************************************************************/ /*########################################################################## _