diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2010-04-30 15:53:08 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2010-04-30 15:53:08 +0000 |
| commit | 3ea657a3e9e755239446dcdbe65069aabc4ecb25 (patch) | |
| tree | 5fc9baf5bbe1b1588fd5dc3adcdb803b24bf5fae /target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch | |
| parent | 845f57debb5658cbef9c6a27583bf1a20c1844c4 (diff) | |
| download | upstream-3ea657a3e9e755239446dcdbe65069aabc4ecb25.tar.gz upstream-3ea657a3e9e755239446dcdbe65069aabc4ecb25.tar.bz2 upstream-3ea657a3e9e755239446dcdbe65069aabc4ecb25.zip | |
kernel: bring ssb in sync with upstream (as of current wireless-testing)
SVN-Revision: 21269
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch index 9e33093070..e6ac4c8e8a 100644 --- a/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch +++ b/target/linux/brcm47xx/patches-2.6.32/150-cpu_fixes.patch @@ -345,7 +345,7 @@ } --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c -@@ -739,6 +739,9 @@ static void __cpuinit build_r4000_tlb_re +@@ -733,6 +733,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 -@@ -1193,6 +1196,9 @@ build_r4000_tlbchange_handler_head(u32 * +@@ -1185,6 +1188,9 @@ build_r4000_tlbchange_handler_head(u32 * struct uasm_reloc **r, unsigned int pte, unsigned int ptr) { |