aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-11-27 22:47:11 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-11-27 22:47:11 +0000
commitfb27da9487421f7e008c6ddb59fb23122dcc51c5 (patch)
tree9a288522a688a655ab4963eb9c1d27b68994d10c /target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch
parentb54002aa8ec6b3c4cc980179d0cf8b0e828d4efa (diff)
downloadupstream-fb27da9487421f7e008c6ddb59fb23122dcc51c5.tar.gz
upstream-fb27da9487421f7e008c6ddb59fb23122dcc51c5.tar.bz2
upstream-fb27da9487421f7e008c6ddb59fb23122dcc51c5.zip
brcm47xx: reorder patches like they were commitet upstream
SVN-Revision: 24162
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch b/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch
index fb3dd60962..d9866dc9e4 100644
--- a/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch
+++ b/target/linux/brcm47xx/patches-2.6.37/920-cache-wround.patch
@@ -34,7 +34,7 @@
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
-@@ -712,6 +712,9 @@ build_get_pgde32(u32 **p, unsigned int t
+@@ -711,6 +711,9 @@ build_get_pgde32(u32 **p, unsigned int t
#endif
uasm_i_addu(p, ptr, tmp, ptr);
#else
@@ -44,7 +44,7 @@
UASM_i_LA_mostly(p, ptr, pgdc);
#endif
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
-@@ -873,12 +876,12 @@ static void __cpuinit build_r4000_tlb_re
+@@ -872,12 +875,12 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
@@ -60,7 +60,7 @@
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
#endif
-@@ -890,6 +893,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -889,6 +892,9 @@ static void __cpuinit build_r4000_tlb_re
build_update_entries(&p, K0, K1);
build_tlb_write_entry(&p, &l, &r, tlb_random);
uasm_l_leave(&l, p);
@@ -70,7 +70,7 @@
uasm_i_eret(&p); /* return from trap */
#ifdef CONFIG_HUGETLB_PAGE
-@@ -1326,12 +1332,12 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1325,12 +1331,12 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
@@ -86,7 +86,7 @@
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
#endif
-@@ -1368,6 +1374,9 @@ build_r4000_tlbchange_handler_tail(u32 *
+@@ -1367,6 +1373,9 @@ build_r4000_tlbchange_handler_tail(u32 *
build_update_entries(p, tmp, ptr);
build_tlb_write_entry(p, l, r, tlb_indexed);
uasm_l_leave(l, *p);