aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.18/032-bcma-from-4.6.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/generic/patches-3.18/032-bcma-from-4.6.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/generic/patches-3.18/032-bcma-from-4.6.patch')
-rw-r--r--target/linux/generic/patches-3.18/032-bcma-from-4.6.patch4
1 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch b/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch
index a74d9eead9..0f8c362e94 100644
--- a/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch
+++ b/target/linux/generic/patches-3.18/032-bcma-from-4.6.patch
@@ -327,7 +327,7 @@
#define BCMA_CORE_ARM_CA7 0x847
#define BCMA_CORE_SYS_MEM 0x849
#define BCMA_CORE_DEFAULT 0xFFF
-@@ -199,6 +201,7 @@ struct bcma_host_ops {
+@@ -200,6 +202,7 @@ struct bcma_host_ops {
#define BCMA_PKG_ID_BCM4707 1
#define BCMA_PKG_ID_BCM4708 2
#define BCMA_PKG_ID_BCM4709 0
@@ -398,7 +398,7 @@
extern u32 bcma_chipco_get_alp_clock(struct bcma_drv_cc *cc);
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
-@@ -47,7 +47,6 @@ void bcma_core_chipcommon_early_init(str
+@@ -45,7 +45,6 @@ void bcma_core_chipcommon_early_init(str
void bcma_core_chipcommon_init(struct bcma_drv_cc *cc);
void bcma_chipco_bcm4331_ext_pa_lines_ctl(struct bcma_drv_cc *cc, bool enable);
#ifdef CONFIG_BCMA_DRIVER_MIPS