diff options
author | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2015-03-18 18:21:08 +0000 |
commit | 17afb853eec6dc4f39f0815831379be004f98cc5 (patch) | |
tree | 5feb5a032288f0a36cc3890d258bcfb95b2f1ad3 /target/linux/generic/patches-3.19 | |
parent | 87568ebeacd733d211da5dcce8d82df4aa872b84 (diff) | |
download | upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.gz upstream-17afb853eec6dc4f39f0815831379be004f98cc5.tar.bz2 upstream-17afb853eec6dc4f39f0815831379be004f98cc5.zip |
kernel: bump to 3.14.35, 3.18.9, 3.19.1 and 4.0-rc4
also refresh generic patches for 3.14, 3.18, 3.19 and 4.0
targets might need a minor refresh as well, however, it looks
like everything still applies cleanly with occasional small
offsets.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
SVN-Revision: 44876
Diffstat (limited to 'target/linux/generic/patches-3.19')
6 files changed, 16 insertions, 31 deletions
diff --git a/target/linux/generic/patches-3.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch b/target/linux/generic/patches-3.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch index 457b0bd6bf..468a539c25 100644 --- a/target/linux/generic/patches-3.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch +++ b/target/linux/generic/patches-3.19/330-MIPS-kexec-Accept-command-line-parameters-from-users.patch @@ -12,8 +12,6 @@ Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> 3 files changed, 167 insertions(+), 27 deletions(-) create mode 100644 arch/mips/kernel/machine_kexec.h -diff --git a/arch/mips/kernel/machine_kexec.c b/arch/mips/kernel/machine_kexec.c -index 50980bf3..b9c0f75 100644 --- a/arch/mips/kernel/machine_kexec.c +++ b/arch/mips/kernel/machine_kexec.c @@ -10,45 +10,145 @@ @@ -195,7 +193,9 @@ index 50980bf3..b9c0f75 100644 kexec_indirection_page = (unsigned long)&image->head; } + pr_info("kexec_indirection_page = %p\n", (void *)kexec_indirection_page); -+ + +- memcpy((void*)reboot_code_buffer, relocate_new_kernel, +- relocate_new_kernel_size); + pr_info("Where is memcpy: %p\n", memcpy); + pr_info("kexec_relocate_new_kernel = %p, kexec_relocate_new_kernel_end = %p\n", + (void *)kexec_relocate_new_kernel, &kexec_relocate_new_kernel_end); @@ -203,9 +203,7 @@ index 50980bf3..b9c0f75 100644 + (void *)kexec_relocate_new_kernel, (void *)reboot_code_buffer); + memcpy((void*)reboot_code_buffer, kexec_relocate_new_kernel, + KEXEC_RELOCATE_NEW_KERNEL_SIZE); - -- memcpy((void*)reboot_code_buffer, relocate_new_kernel, -- relocate_new_kernel_size); ++ + pr_info("Before _print_args().\n"); + machine_kexec_print_args(); + pr_info("Before eval loop.\n"); @@ -232,9 +230,6 @@ index 50980bf3..b9c0f75 100644 smp_wmb(); atomic_set(&kexec_ready_to_reboot, 1); #endif -diff --git a/arch/mips/kernel/machine_kexec.h b/arch/mips/kernel/machine_kexec.h -new file mode 100644 -index 0000000..ae0961e --- /dev/null +++ b/arch/mips/kernel/machine_kexec.h @@ -0,0 +1,20 @@ @@ -258,8 +253,6 @@ index 0000000..ae0961e +#define KEXEC_MAX_ARGC (KEXEC_ARGV_SIZE / sizeof(long)) + +#endif -diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S -index 74bab9d..2c92c50 100644 --- a/arch/mips/kernel/relocate_kernel.S +++ b/arch/mips/kernel/relocate_kernel.S @@ -12,8 +12,9 @@ @@ -291,18 +284,15 @@ index 74bab9d..2c92c50 100644 + EXPORT(kexec_argv_buf) + .skip KEXEC_COMMAND_LINE_SIZE + .size kexec_argv_buf, KEXEC_COMMAND_LINE_SIZE ++ ++kexec_argv: ++ EXPORT(kexec_argv) ++ .skip KEXEC_ARGV_SIZE ++ .size kexec_argv, KEXEC_ARGV_SIZE -relocate_new_kernel_size: - EXPORT(relocate_new_kernel_size) - PTR relocate_new_kernel_end - relocate_new_kernel - .size relocate_new_kernel_size, PTRSIZE -+kexec_argv: -+ EXPORT(kexec_argv) -+ .skip KEXEC_ARGV_SIZE -+ .size kexec_argv, KEXEC_ARGV_SIZE -+ +kexec_relocate_new_kernel_end: + EXPORT(kexec_relocate_new_kernel_end) --- -1.7.10.4 - diff --git a/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch b/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch index 855b9fc134..1ef630f844 100644 --- a/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch +++ b/target/linux/generic/patches-3.19/505-yaffs-3.16-new-fops.patch @@ -1,6 +1,6 @@ --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -796,13 +796,13 @@ +@@ -796,13 +796,13 @@ static int yaffs_sync_object(struct file static const struct file_operations yaffs_file_operations = { .read = do_sync_read, .write = do_sync_write, @@ -17,7 +17,7 @@ .llseek = generic_file_llseek, }; -@@ -1050,7 +1050,7 @@ +@@ -1050,7 +1050,7 @@ static int yaffs_readlink(struct dentry if (!alias) return -ENOMEM; diff --git a/target/linux/generic/patches-3.19/532-jffs2_eofdetect.patch b/target/linux/generic/patches-3.19/532-jffs2_eofdetect.patch index 269179063c..9cbe183138 100644 --- a/target/linux/generic/patches-3.19/532-jffs2_eofdetect.patch +++ b/target/linux/generic/patches-3.19/532-jffs2_eofdetect.patch @@ -36,7 +36,7 @@ if (ret < 0) goto out; -@@ -556,6 +562,17 @@ static int jffs2_scan_eraseblock (struct +@@ -561,6 +567,17 @@ full_scan: return err; } diff --git a/target/linux/generic/patches-3.19/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch b/target/linux/generic/patches-3.19/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch index 0043b4c84f..1d6b66c199 100644 --- a/target/linux/generic/patches-3.19/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch +++ b/target/linux/generic/patches-3.19/770-bgmac-fix-device-initialization-on-Northstar-SoCs-co.patch @@ -18,11 +18,9 @@ Can we have it for 3.20, please? drivers/net/ethernet/broadcom/bgmac.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) -diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c -index 3007d95..728373b 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c -@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct bgmac *bgmac) +@@ -1412,6 +1412,7 @@ static void bgmac_mii_unregister(struct /* http://bcm-v4.sipsolutions.net/mac-gbit/gmac/chipattach */ static int bgmac_probe(struct bcma_device *core) { @@ -30,7 +28,7 @@ index 3007d95..728373b 100644 struct net_device *net_dev; struct bgmac *bgmac; struct ssb_sprom *sprom = &core->bus->sprom; -@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_device *core) +@@ -1474,8 +1475,8 @@ static int bgmac_probe(struct bcma_devic bgmac_chip_reset(bgmac); /* For Northstar, we have to take all GMAC core out of reset */ @@ -41,6 +39,3 @@ index 3007d95..728373b 100644 struct bcma_device *ns_core; int ns_gmac; --- -1.8.4.5 - diff --git a/target/linux/generic/patches-3.19/811-pci_disable_usb_common_quirks.patch b/target/linux/generic/patches-3.19/811-pci_disable_usb_common_quirks.patch index cd03cda83b..8b784ecd0f 100644 --- a/target/linux/generic/patches-3.19/811-pci_disable_usb_common_quirks.patch +++ b/target/linux/generic/patches-3.19/811-pci_disable_usb_common_quirks.patch @@ -84,7 +84,7 @@ #endif /* __LINUX_USB_PCI_QUIRKS_H */ --- a/include/linux/usb/hcd.h +++ b/include/linux/usb/hcd.h -@@ -445,7 +445,14 @@ extern int usb_hcd_pci_probe(struct pci_ +@@ -447,7 +447,14 @@ extern int usb_hcd_pci_probe(struct pci_ extern void usb_hcd_pci_remove(struct pci_dev *dev); extern void usb_hcd_pci_shutdown(struct pci_dev *dev); diff --git a/target/linux/generic/patches-3.19/820-usb_add_usb_find_device_by_name.patch b/target/linux/generic/patches-3.19/820-usb_add_usb_find_device_by_name.patch index ee171c993b..53bff5ea90 100644 --- a/target/linux/generic/patches-3.19/820-usb_add_usb_find_device_by_name.patch +++ b/target/linux/generic/patches-3.19/820-usb_add_usb_find_device_by_name.patch @@ -74,7 +74,7 @@ * @dev: device the buffer will be used with --- a/include/linux/usb.h +++ b/include/linux/usb.h -@@ -700,6 +700,7 @@ static inline bool usb_device_no_sg_cons +@@ -695,6 +695,7 @@ static inline bool usb_device_no_sg_cons return udev && udev->bus && udev->bus->no_sg_constraint; } |