diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-23 16:41:34 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-23 16:41:34 +0000 |
| commit | 8f94a9a224f0c4763829951d9940af5df5f487b8 (patch) | |
| tree | fd395ec0f7cb0ed7aa3dd20a24651d322d79c07b /target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch | |
| parent | 6a3cc2583b0bb30e26cc901c201e61ac0e6b1335 (diff) | |
| download | mtk-20170518-8f94a9a224f0c4763829951d9940af5df5f487b8.zip mtk-20170518-8f94a9a224f0c4763829951d9940af5df5f487b8.tar.gz mtk-20170518-8f94a9a224f0c4763829951d9940af5df5f487b8.tar.bz2 | |
linux/brcm47xx: sync yhe BCM4710 fix with the upcoming upstream patch.
SVN-Revision: 24116
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch index d791c7a..eac8fb9 100644 --- a/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch @@ -319,7 +319,7 @@ + /* Check if special workarounds are required */ +#ifdef CONFIG_BCM47XX -+ if (current_cpu_data.cputype == CPU_BCM4710 && (current_cpu_data.processor_id & 0xff) == 0) { ++ if (current_cpu_data.cputype == CPU_BMIPS32 && (current_cpu_data.processor_id & 0xff) == 0) { + printk("Enabling BCM4710A0 cache workarounds.\n"); + bcm4710 = 1; + } else @@ -345,7 +345,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -873,6 +873,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -872,6 +872,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 -@@ -1323,6 +1326,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1322,6 +1325,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { |