aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-07-19 20:25:20 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-07-19 20:25:20 +0000
commit49edb3c342b79913df0fa0b16719e2afcab7cfdc (patch)
treedb3c0bd78af0dd17e5233982fdb1edadfd25bb28 /target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
parent0799e77a8b44009bb6fc34a314bcbf8c970ad47a (diff)
downloadupstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.gz
upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.tar.bz2
upstream-49edb3c342b79913df0fa0b16719e2afcab7cfdc.zip
brcm47xx: prepare brcm47xx patches for sending to mainline.
SVN-Revision: 22296
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
index de79ca8898..b4d235c0da 100644
--- a/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
@@ -295,7 +295,7 @@
if (dc_lsize)
protected_writeback_dcache_line(addr & ~(dc_lsize - 1));
if (!cpu_icache_snoops_remote_store && scache_size)
-@@ -1298,6 +1312,17 @@ static void __cpuinit coherency_setup(vo
+@@ -1311,6 +1325,17 @@ static void __cpuinit coherency_setup(vo
* silly idea of putting something else there ...
*/
switch (current_cpu_type()) {
@@ -313,7 +313,7 @@
case CPU_R4000PC:
case CPU_R4000SC:
case CPU_R4000MC:
-@@ -1354,6 +1379,15 @@ void __cpuinit r4k_cache_init(void)
+@@ -1367,6 +1392,15 @@ void __cpuinit r4k_cache_init(void)
break;
}
@@ -329,7 +329,7 @@
probe_pcache();
setup_scache();
-@@ -1412,5 +1446,13 @@ void __cpuinit r4k_cache_init(void)
+@@ -1425,5 +1459,13 @@ void __cpuinit r4k_cache_init(void)
#if !defined(CONFIG_MIPS_CMP)
local_r4k___flush_cache_all(NULL);
#endif