projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm47xx: fix a small copy&paste error in the b44 fix for 2.6.34 and 2.6.35
[openwrt.git]
/
target
/
linux
/
brcm47xx
/
patches-2.6.34
/
150-cpu_fixes.patch
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
4198614
..
de79ca8
100644
(file)
--- a/
target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
+++ b/
target/linux/brcm47xx/patches-2.6.34/150-cpu_fixes.patch
@@
-7,7
+7,7
@@
+#ifdef CONFIG_BCM47XX
+#include <asm/paccess.h>
+#include <linux/ssb/ssb.h>
+#ifdef CONFIG_BCM47XX
+#include <asm/paccess.h>
+#include <linux/ssb/ssb.h>
-+#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE
+ SSB_IMSTATE
)))
++#define BCM4710_DUMMY_RREG() ((void) *((u8 *) KSEG1ADDR(SSB_ENUM_BASE)))
+
+#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
+#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
+
+#define BCM4710_FILL_TLB(addr) (*(volatile unsigned long *)(addr))
+#define BCM4710_PROTECTED_FILL_TLB(addr) ({ unsigned long x; get_dbe(x, (volatile unsigned long *)(addr)); })
@@
-220,7
+220,7
@@
#endif /* _ASM_R4KCACHE_H */
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
#endif /* _ASM_R4KCACHE_H */
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
-@@ -4
30,6 +430
,10 @@
+@@ -4
49,6 +449
,10 @@
.macro RESTORE_SP_AND_RET
LONG_L sp, PT_R29(sp)
.set mips3
.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
}
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
-@@ -
749,6 +749
,9 @@ static void __cpuinit build_r4000_tlb_re
+@@ -
868,6 +868
,9 @@ static void __cpuinit build_r4000_tlb_re
/* No need for uasm_i_nop */
}
/* 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
#ifdef CONFIG_64BIT
build_get_pmde64(&p, &l, &r, K0, K1); /* get pmd in K1 */
#else
-@@ -1
203,6 +1206
,9 @@ build_r4000_tlbchange_handler_head(u32 *
+@@ -1
318,6 +1321
,9 @@ build_r4000_tlbchange_handler_head(u32 *
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
struct uasm_reloc **r, unsigned int pte,
unsigned int ptr)
{
This page took
0.02337 seconds
and
4
git commands to generate.