aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch
diff options
context:
space:
mode:
authorZoltan HERPAI <wigyori@uid0.hu>2016-10-25 22:58:12 +0200
committerZoltan HERPAI <wigyori@uid0.hu>2016-10-25 22:58:12 +0200
commit2c54d989b46284bc5ee5b43d4ba7c2762c2241ed (patch)
tree1da1495f9fc9f046a169fb451ea5e6af13cc6453 /target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch
parent2aefb514a4852f4c427b467150bbc7cdfe024528 (diff)
downloadupstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.tar.gz
upstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.tar.bz2
upstream-2c54d989b46284bc5ee5b43d4ba7c2762c2241ed.zip
CC: generic: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37 Fixes CVE-2016-5195 (dirtycow) Compile-tested on ar71xx, mxs, sunxi, imx6 Runtime-tested on ar71xx (PB42) Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch')
-rw-r--r--target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch b/target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch
index d802a12d60..d34712b71e 100644
--- a/target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch
+++ b/target/linux/ar71xx/patches-3.18/815-MIPS-ath79-add-mr1750-support.patch
@@ -1,6 +1,6 @@
--- a/arch/mips/ath79/Kconfig
+++ b/arch/mips/ath79/Kconfig
-@@ -763,6 +763,16 @@ config ATH79_MACH_CAP4200AG
+@@ -858,6 +858,16 @@ config ATH79_MACH_CAP4200AG
select ATH79_DEV_M25P80
select ATH79_DEV_WMAC
@@ -19,7 +19,7 @@
select SOC_QCA955X
--- a/arch/mips/ath79/Makefile
+++ b/arch/mips/ath79/Makefile
-@@ -80,6 +80,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB) += ma
+@@ -86,6 +86,7 @@ obj-$(CONFIG_ATH79_MACH_HORNET_UB) += ma
obj-$(CONFIG_ATH79_MACH_MC_MAC1200R) += mach-mc-mac1200r.o
obj-$(CONFIG_ATH79_MACH_MR12) += mach-mr12.o
obj-$(CONFIG_ATH79_MACH_MR16) += mach-mr16.o
@@ -29,7 +29,7 @@
obj-$(CONFIG_ATH79_MACH_MYNET_N600) += mach-mynet-n600.o
--- a/arch/mips/ath79/machtypes.h
+++ b/arch/mips/ath79/machtypes.h
-@@ -69,6 +69,7 @@ enum ath79_mach_type {
+@@ -75,6 +75,7 @@ enum ath79_mach_type {
ATH79_MACH_HORNET_UB, /* ALFA Networks Hornet-UB */
ATH79_MACH_MR12, /* Cisco Meraki MR12 */
ATH79_MACH_MR16, /* Cisco Meraki MR16 */