aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-03-12 12:30:30 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-03-12 15:45:50 +0100
commit9a065fcfecbf344812a92dbd9b28298da7ef2b74 (patch)
treec01ee36c2d11f00cd1f66953e100c1316bc6453e /target/linux/generic
parentf5d403488ed62bb7f0e0017b02890b4d72240a55 (diff)
downloadupstream-9a065fcfecbf344812a92dbd9b28298da7ef2b74.tar.gz
upstream-9a065fcfecbf344812a92dbd9b28298da7ef2b74.tar.bz2
upstream-9a065fcfecbf344812a92dbd9b28298da7ef2b74.zip
kernel: update kernel 4.9 to 4.9.14
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.9/040-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch2
-rw-r--r--target/linux/generic/patches-4.9/070-bcma-from-4.11.patch20
2 files changed, 1 insertions, 21 deletions
diff --git a/target/linux/generic/patches-4.9/040-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch b/target/linux/generic/patches-4.9/040-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch
index 3f078c434c..b2e90c8b9b 100644
--- a/target/linux/generic/patches-4.9/040-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch
+++ b/target/linux/generic/patches-4.9/040-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch
@@ -19,7 +19,7 @@ Signed-off-by: Matt Redfearn <matt.redfearn@imgtec.com>
#include <asm/msa.h>
#include <asm/pgtable.h>
#include <asm/mipsregs.h>
-@@ -511,7 +512,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);
+@@ -556,7 +557,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);
unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
unsigned long pc, unsigned long *ra)
{
diff --git a/target/linux/generic/patches-4.9/070-bcma-from-4.11.patch b/target/linux/generic/patches-4.9/070-bcma-from-4.11.patch
index d5bdd2d5ae..a3b0321986 100644
--- a/target/linux/generic/patches-4.9/070-bcma-from-4.11.patch
+++ b/target/linux/generic/patches-4.9/070-bcma-from-4.11.patch
@@ -83,23 +83,3 @@
} else {
core->dev.dma_mask = &core->dev.coherent_dma_mask;
core->dma_dev = &core->dev;
-@@ -633,8 +634,11 @@ static int bcma_device_probe(struct devi
- drv);
- int err = 0;
-
-+ get_device(dev);
- if (adrv->probe)
- err = adrv->probe(core);
-+ if (err)
-+ put_device(dev);
-
- return err;
- }
-@@ -647,6 +651,7 @@ static int bcma_device_remove(struct dev
-
- if (adrv->remove)
- adrv->remove(core);
-+ put_device(dev);
-
- return 0;
- }