diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:13:36 +0200 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2016-10-27 15:13:36 +0200 |
| commit | f14d3f5d46d9ef534cd51360f066260fb434548f (patch) | |
| tree | 81ec5060ed9ba99e9bd1eeb2556737cfe0015158 /target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | |
| parent | ce116bc6f997d8d6e6b976cacce5d4c60d705fc6 (diff) | |
| download | master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.gz master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.tar.bz2 master-187ad058-f14d3f5d46d9ef534cd51360f066260fb434548f.zip | |
generic/3.18: bump kernel to 3.18.44
Patch 610- is updated as check_entry helper was killed in 3.18.37
Patch 666- is updated (thanks to Stijn Tintel)
Fixes CVE-2016-5195 (dirtycow)
Compile-tested on adm5120 and mcs814x
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
Diffstat (limited to 'target/linux/generic/patches-3.18/026-bcma-from-3.20.patch')
| -rw-r--r-- | target/linux/generic/patches-3.18/026-bcma-from-3.20.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch index 17c06b001f..628b0bd389 100644 --- a/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch +++ b/target/linux/generic/patches-3.18/026-bcma-from-3.20.patch @@ -1,6 +1,6 @@ --- a/drivers/bcma/bcma_private.h +++ b/drivers/bcma/bcma_private.h -@@ -25,22 +25,18 @@ struct bcma_bus; +@@ -23,22 +23,18 @@ struct bcma_bus; bool bcma_wait_value(struct bcma_device *core, u16 reg, u32 mask, u32 value, int timeout); void bcma_prepare_core(struct bcma_bus *bus, struct bcma_device *core); @@ -26,7 +26,7 @@ /* sprom.c */ int bcma_sprom_get(struct bcma_bus *bus); -@@ -111,6 +107,14 @@ extern int bcma_chipco_watchdog_register +@@ -109,6 +105,14 @@ extern int bcma_chipco_watchdog_register #ifdef CONFIG_BCMA_DRIVER_PCI_HOSTMODE bool bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc); void bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc); @@ -467,7 +467,7 @@ if (!bus->drv_cc.core) --- a/include/linux/bcma/bcma.h +++ b/include/linux/bcma/bcma.h -@@ -318,6 +318,7 @@ struct bcma_bus { +@@ -319,6 +319,7 @@ struct bcma_bus { const struct bcma_host_ops *ops; enum bcma_hosttype hosttype; |