diff options
| author | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-22 17:17:15 +0000 |
|---|---|---|
| committer | Alexandros C. Couloumbis <alex@ozo.com> | 2010-11-22 17:17:15 +0000 |
| commit | aab31771f8120a719f201417e0b47d71f8da9898 (patch) | |
| tree | f963f3e9dfc549e3772059cc602047e1a0ba54ef /target/linux/brcm47xx/patches-2.6.37/150-cpu_fixes.patch | |
| parent | 47d7ed3d09590fe8c79b0fb147718f891709a972 (diff) | |
| download | upstream-aab31771f8120a719f201417e0b47d71f8da9898.tar.gz upstream-aab31771f8120a719f201417e0b47d71f8da9898.tar.bz2 upstream-aab31771f8120a719f201417e0b47d71f8da9898.zip | |
linux/brcm47xx: mainline 2.6.37 602977b0d672687909b0cb0542ede134ed6ef858 commit broke CPU revision: 00024000, MIPS (cc 0x805, rev 0x00, vendor 0x4243) functionality. Revert that patch until we get a proper fix.
SVN-Revision: 24096
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 | 8 |
1 files changed, 4 insertions, 4 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 4533998e64..eae16b0812 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 @@ -299,7 +299,7 @@ * silly idea of putting something else there ... */ switch (current_cpu_type()) { -+ case CPU_BMIPS3300: ++ case CPU_BCM3302: + { + u32 cm; + cm = read_c0_diag(); @@ -319,7 +319,7 @@ + /* Check if special workarounds are required */ +#ifdef CONFIG_BCM47XX -+ if (current_cpu_data.cputype == CPU_4KC && (current_cpu_data.processor_id & 0xff) == 0) { ++ if (current_cpu_data.cputype == CPU_BCM4710 && (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 -@@ -872,6 +872,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -873,6 +873,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 -@@ -1322,6 +1325,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1323,6 +1326,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { |