aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2017-03-12 13:05:26 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2017-03-12 15:46:02 +0100
commit31c64521070bb07e456edf47e36e3fdd80f95cd2 (patch)
tree29d4eaa104a94f6752aa527112328633939a3ffe /target/linux/generic
parent9a065fcfecbf344812a92dbd9b28298da7ef2b74 (diff)
downloadupstream-31c64521070bb07e456edf47e36e3fdd80f95cd2.tar.gz
upstream-31c64521070bb07e456edf47e36e3fdd80f95cd2.tar.bz2
upstream-31c64521070bb07e456edf47e36e3fdd80f95cd2.zip
kernel: update kernel 4.4 to 4.4.53
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/020-bcma-from-4.5.patch4
-rw-r--r--target/linux/generic/patches-4.4/025-bcma-from-4.11.patch20
-rw-r--r--target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch2
3 files changed, 3 insertions, 23 deletions
diff --git a/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch b/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch
index 21ebff58b6..c5d7bc7e5e 100644
--- a/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch
+++ b/target/linux/generic/patches-4.4/020-bcma-from-4.5.patch
@@ -1,6 +1,6 @@
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
-@@ -668,11 +668,36 @@ static int bcma_device_uevent(struct dev
+@@ -672,11 +672,36 @@ static int bcma_device_uevent(struct dev
core->id.rev, core->id.class);
}
@@ -38,7 +38,7 @@
if (err)
return err;
-@@ -691,7 +716,7 @@ static int __init bcma_modinit(void)
+@@ -695,7 +720,7 @@ static int __init bcma_modinit(void)
return err;
}
diff --git a/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch b/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch
index d5bdd2d5ae..a3b0321986 100644
--- a/target/linux/generic/patches-4.4/025-bcma-from-4.11.patch
+++ b/target/linux/generic/patches-4.4/025-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;
- }
diff --git a/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch b/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch
index 513e904e52..fc559ee6dd 100644
--- a/target/linux/generic/patches-4.4/062-02-MIPS-Stack-unwinding-while-on-IRQ-stack.patch
+++ b/target/linux/generic/patches-4.4/062-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>
-@@ -507,7 +508,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);
+@@ -552,7 +553,19 @@ EXPORT_SYMBOL(unwind_stack_by_address);
unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
unsigned long pc, unsigned long *ra)
{