aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-3.18
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-09-11 10:48:34 +0000
committerJonas Gorski <jogo@openwrt.org>2015-09-11 10:48:34 +0000
commit8cb7552c46cff627eb8179ccc4c071f98563ec16 (patch)
tree3f1fc9b02283adde7d5fa27f892a30612e741a35 /target/linux/brcm47xx/patches-3.18
parent0dc3d0e7c74bf8d50c3a2bfc335e5e717ab4051f (diff)
downloadupstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.tar.gz
upstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.tar.bz2
upstream-8cb7552c46cff627eb8179ccc4c071f98563ec16.zip
CC: kernel: update 3.18 to 3.18.21
Changelog: * https://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.18.21 Signed-off-by: Jonas Gorski <jogo@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/branches/chaos_calmer@46847 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-3.18')
-rw-r--r--target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch b/target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch
index dd430f52dd..48cf095d0e 100644
--- a/target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch
+++ b/target/linux/brcm47xx/patches-3.18/159-cpu_fixes.patch
@@ -242,7 +242,7 @@
#endif /* _ASM_R4KCACHE_H */
--- a/arch/mips/include/asm/stackframe.h
+++ b/arch/mips/include/asm/stackframe.h
-@@ -333,6 +333,10 @@
+@@ -358,6 +358,10 @@
.macro RESTORE_SP_AND_RET
LONG_L sp, PT_R29(sp)
.set arch=r4000