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-04-18 18:22:50 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-04-18 18:22:50 +0000
commit79075b8d13dbd022bcf81ba18ede419927cfd6bb (patch)
tree3fea10430e67ca25b154641a72795200c6e34b7b /target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
parent3ed2f88bbac0d376ad2bc1cab46fba6a2bc395f1 (diff)
downloadupstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.tar.gz
upstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.tar.bz2
upstream-79075b8d13dbd022bcf81ba18ede419927cfd6bb.zip
brcm47xx: refresh patches
SVN-Revision: 20996
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 4198614441..56fdbbc62b 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
@@ -220,7 +220,7 @@
#endif /* _ASM_R4KCACHE_H */
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
-@@ -430,6 +430,10 @@
+@@ -449,6 +449,10 @@
.macro RESTORE_SP_AND_RET
LONG_L sp, PT_R29(sp)
.set mips3
@@ -345,7 +345,7 @@
}
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
-@@ -749,6 +749,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -801,6 +801,9 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
@@ -355,7 +355,7 @@
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
-@@ -1203,6 +1206,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1260,6 +1263,9 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{