aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2015-09-02 10:18:15 +0000
committerJonas Gorski <jogo@openwrt.org>2015-09-02 10:18:15 +0000
commit7d6cff4882e1484e09956e19825acdae3a68618c (patch)
tree76a46ad583bca975dd2cb71f20543fa2c1eee425 /target/linux/brcm47xx
parent7747092ed1d906b247d834735941d995a62c5556 (diff)
downloadupstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.gz
upstream-7d6cff4882e1484e09956e19825acdae3a68618c.tar.bz2
upstream-7d6cff4882e1484e09956e19825acdae3a68618c.zip
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> SVN-Revision: 46768
Diffstat (limited to 'target/linux/brcm47xx')
-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