xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'sh/stable-updates'

Browse Source 
Conflicts:
	arch/sh/mm/cache-sh4.c
This commit is contained in:
Paul Mundt
2009-10-16 15:14:50 +09:00
parent 731ba3301d 52a94909f0
commit abeaf33a41
240 changed files with 12154 additions and 1096 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
arch/sh/mm/cache.c
View File

@@ -271,6 +271,8 @@ static void __init emit_cache_params(void)
void __init cpu_cache_init(void)
{
unsigned int cache_disabled = !(__raw_readl(CCR) & CCR_CACHE_ENABLE);
compute_alias(&boot_cpu_data.icache);
compute_alias(&boot_cpu_data.dcache);
compute_alias(&boot_cpu_data.scache);
@@ -279,6 +281,13 @@ void __init cpu_cache_init(void)
__flush_purge_region = noop__flush_region;
__flush_invalidate_region = noop__flush_region;
/*
* No flushing is necessary in the disabled cache case so we can
* just keep the noop functions in local_flush_..() and __flush_..()
*/
if (unlikely(cache_disabled))
goto skip;
if (boot_cpu_data.family == CPU_FAMILY_SH2) {
extern void __weak sh2_cache_init(void);
@@ -318,5 +327,6 @@ void __init cpu_cache_init(void)
sh5_cache_init();
}
skip:
emit_cache_params();
}