mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
[backfire] backport ssb updates from r21269, this is required for future mac80211 updates
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21276 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -31,7 +31,7 @@
|
||||
|
||||
--- a/arch/mips/mm/tlbex.c
|
||||
+++ b/arch/mips/mm/tlbex.c
|
||||
@@ -601,6 +601,9 @@ build_get_pgde32(u32 **p, unsigned int t
|
||||
@@ -595,6 +595,9 @@ build_get_pgde32(u32 **p, unsigned int t
|
||||
#endif
|
||||
uasm_i_addu(p, ptr, tmp, ptr);
|
||||
#else
|
||||
@@ -41,7 +41,7 @@
|
||||
UASM_i_LA_mostly(p, ptr, pgdc);
|
||||
#endif
|
||||
uasm_i_mfc0(p, tmp, C0_BADVADDR); /* get faulting address */
|
||||
@@ -739,12 +742,12 @@ static void __cpuinit build_r4000_tlb_re
|
||||
@@ -733,12 +736,12 @@ static void __cpuinit build_r4000_tlb_re
|
||||
/* No need for uasm_i_nop */
|
||||
}
|
||||
|
||||
@@ -57,7 +57,7 @@
|
||||
build_get_pgde32(&p, K0, K1); /* get pgd in K1 */
|
||||
#endif
|
||||
|
||||
@@ -756,6 +759,9 @@ static void __cpuinit build_r4000_tlb_re
|
||||
@@ -750,6 +753,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);
|
||||
@@ -67,7 +67,7 @@
|
||||
uasm_i_eret(&p); /* return from trap */
|
||||
|
||||
#ifdef CONFIG_HUGETLB_PAGE
|
||||
@@ -1196,12 +1202,12 @@ build_r4000_tlbchange_handler_head(u32 *
|
||||
@@ -1188,12 +1194,12 @@ build_r4000_tlbchange_handler_head(u32 *
|
||||
struct uasm_reloc **r, unsigned int pte,
|
||||
unsigned int ptr)
|
||||
{
|
||||
@@ -83,7 +83,7 @@
|
||||
build_get_pgde32(p, pte, ptr); /* get pgd in ptr */
|
||||
#endif
|
||||
|
||||
@@ -1238,6 +1244,9 @@ build_r4000_tlbchange_handler_tail(u32 *
|
||||
@@ -1230,6 +1236,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);
|
||||
|
||||
Reference in New Issue
Block a user