summaryrefslogtreecommitdiff
path: root/target/linux/ramips/patches-4.4/101-mt7621-timer.patch
diff options
context:
space:
mode:
authorKevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>2017-08-17 17:58:24 +0100
committerStijn Tintel <stijn@linux-ipv6.be>2017-08-17 19:47:27 +0200
commit4a1b87aba448fae648bf17830379fde11060927b (patch)
tree0f769693caf6f7210c6aece9d06e0c3f37fbc4ff /target/linux/ramips/patches-4.4/101-mt7621-timer.patch
parentcae20f64b555cfb76f74eb115b2d01fcb22ca462 (diff)
downloadmtk-20170518-4a1b87aba448fae648bf17830379fde11060927b.zip
mtk-20170518-4a1b87aba448fae648bf17830379fde11060927b.tar.gz
mtk-20170518-4a1b87aba448fae648bf17830379fde11060927b.tar.bz2
kernel: update 4.4 to 4.4.83
Refresh patches. Minor update 704-phy-no-genphy-soft-reset.patch which was partially accepted upstream. Compile-tested on ar71xx. Runtime-tested on ar71xx. Fixes the following vulnerabilities: - CVE-2017-7533 (4.4.80) - CVE-2017-1000111 (4.4.82) - CVE-2017-1000112 (4.4.82) Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
Diffstat (limited to 'target/linux/ramips/patches-4.4/101-mt7621-timer.patch')
-rw-r--r--target/linux/ramips/patches-4.4/101-mt7621-timer.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/ramips/patches-4.4/101-mt7621-timer.patch b/target/linux/ramips/patches-4.4/101-mt7621-timer.patch
index 02497bc..630bb2c 100644
--- a/target/linux/ramips/patches-4.4/101-mt7621-timer.patch
+++ b/target/linux/ramips/patches-4.4/101-mt7621-timer.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ralink/mt7621.c
+++ b/arch/mips/ralink/mt7621.c
-@@ -18,6 +18,7 @@
+@@ -21,6 +21,7 @@
#include <asm/mach-ralink/ralink_regs.h>
#include <asm/mach-ralink/mt7621.h>
#include <asm/mips-boards/launch.h>
@@ -8,7 +8,7 @@
#include <pinmux.h>
-@@ -179,6 +180,58 @@ bool plat_cpu_core_present(int core)
+@@ -178,6 +179,58 @@ bool plat_cpu_core_present(int core)
return true;
}
@@ -79,7 +79,7 @@
choice
--- a/arch/mips/ralink/timer-gic.c
+++ b/arch/mips/ralink/timer-gic.c
-@@ -12,6 +12,7 @@
+@@ -3,6 +3,7 @@
#include <linux/of.h>
#include <linux/clk-provider.h>
#include <linux/clocksource.h>
@@ -87,7 +87,7 @@
#include "common.h"
-@@ -19,6 +20,8 @@ void __init plat_time_init(void)
+@@ -10,6 +11,8 @@ void __init plat_time_init(void)
{
ralink_of_remap();