diff options
Diffstat (limited to 'target/linux/generic/patches-3.10')
33 files changed, 78 insertions, 81 deletions
diff --git a/target/linux/generic/patches-3.10/001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch b/target/linux/generic/patches-3.10/001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch index 8920a9cff1..f91dbb5268 100644 --- a/target/linux/generic/patches-3.10/001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch +++ b/target/linux/generic/patches-3.10/001-MIPS-Declare-emulate_load_store_microMIPS-as-a-stati.patch @@ -20,7 +20,7 @@ Signed-off-by: Ralf Baechle <ralf@linux-mips.org> --- a/arch/mips/kernel/unaligned.c +++ b/arch/mips/kernel/unaligned.c -@@ -684,7 +684,8 @@ const int reg16to32[] = { 16, 17, 2, 3, +@@ -684,7 +684,8 @@ const int reg16to32[] = { 16, 17, 2, 3, /* Recode table from 16-bit STORE register notation to 32-bit GPR. */ const int reg16to32st[] = { 0, 17, 2, 3, 4, 5, 6, 7 }; diff --git a/target/linux/generic/patches-3.10/025-bcma_backport.patch b/target/linux/generic/patches-3.10/025-bcma_backport.patch index b8a8692dc7..a4ae800b16 100644 --- a/target/linux/generic/patches-3.10/025-bcma_backport.patch +++ b/target/linux/generic/patches-3.10/025-bcma_backport.patch @@ -66,7 +66,7 @@ } EXPORT_SYMBOL_GPL(bcma_core_disable); -@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device +@@ -43,6 +64,7 @@ int bcma_core_enable(struct bcma_device bcma_aread32(core, BCMA_IOCTL); bcma_awrite32(core, BCMA_RESET_CTL, 0); @@ -269,7 +269,7 @@ { "AT45DB011", 0xc, 256, 512, }, { "AT45DB021", 0x14, 256, 1024, }, { "AT45DB041", 0x1c, 256, 2048, }, -@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc +@@ -89,7 +89,7 @@ int bcma_sflash_init(struct bcma_drv_cc { struct bcma_bus *bus = cc->core->bus; struct bcma_sflash *sflash = &cc->sflash; diff --git a/target/linux/generic/patches-3.10/060-hso_devices.patch b/target/linux/generic/patches-3.10/060-hso_devices.patch index 9354ed5d62..fd7cab7550 100644 --- a/target/linux/generic/patches-3.10/060-hso_devices.patch +++ b/target/linux/generic/patches-3.10/060-hso_devices.patch @@ -15,7 +15,7 @@ {USB_DEVICE(0x0af0, 0xd155)}, --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h -@@ -1252,6 +1252,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 +@@ -1259,6 +1259,18 @@ UNUSUAL_DEV( 0x0af0, 0x8304, 0x0000, 0x0 USB_SC_DEVICE, USB_PR_DEVICE, NULL, 0 ), diff --git a/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch b/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch index 958841da1a..1d53a8d672 100644 --- a/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch +++ b/target/linux/generic/patches-3.10/130-mips_remove_plat_dma_functions.patch @@ -174,7 +174,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> } int mips_dma_supported(struct device *dev, u64 mask) -@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev, +@@ -336,7 +335,6 @@ void dma_cache_sync(struct device *dev, { BUG_ON(direction == DMA_NONE); diff --git a/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch b/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch index 42c8db3f92..a20d3d96b8 100644 --- a/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch +++ b/target/linux/generic/patches-3.10/131-improve_noncoherent_dma_checks.patch @@ -18,7 +18,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -296,7 +296,7 @@ config MIPS_MALTA +@@ -297,7 +297,7 @@ config MIPS_MALTA select CEVT_R4K select CSRC_R4K select CSRC_GIC @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> select GENERIC_ISA_DMA select HAVE_PCSPKR_PLATFORM select IRQ_CPU -@@ -947,6 +947,10 @@ config FW_CFE +@@ -948,6 +948,10 @@ config FW_CFE config ARCH_DMA_ADDR_T_64BIT def_bool (HIGHMEM && 64BIT_PHYS_ADDR) || 64BIT diff --git a/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch b/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch index 0df3b80b84..bc907982e3 100644 --- a/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch +++ b/target/linux/generic/patches-3.10/132-mips_inline_dma_ops.patch @@ -19,7 +19,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1430,6 +1430,7 @@ config CPU_CAVIUM_OCTEON +@@ -1431,6 +1431,7 @@ config CPU_CAVIUM_OCTEON select LIBFDT select USE_OF select USB_EHCI_BIG_ENDIAN_MMIO @@ -27,7 +27,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> help The Cavium Octeon processor is a highly integrated chip containing many ethernet hardware widgets for networking tasks. The processor -@@ -1650,6 +1651,9 @@ config SYS_HAS_CPU_XLR +@@ -1651,6 +1652,9 @@ config SYS_HAS_CPU_XLR config SYS_HAS_CPU_XLP bool @@ -506,7 +506,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> void dma_free_noncoherent(struct device *dev, size_t size, void *vaddr, -@@ -154,8 +136,8 @@ void dma_free_noncoherent(struct device +@@ -154,8 +136,8 @@ void dma_free_noncoherent(struct device } EXPORT_SYMBOL(dma_free_noncoherent); @@ -647,7 +647,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> void dma_cache_sync(struct device *dev, void *vaddr, size_t size, enum dma_data_direction direction) -@@ -343,23 +224,10 @@ void dma_cache_sync(struct device *dev, +@@ -343,23 +224,10 @@ void dma_cache_sync(struct device *dev, EXPORT_SYMBOL(dma_cache_sync); diff --git a/target/linux/generic/patches-3.10/204-module_strip.patch b/target/linux/generic/patches-3.10/204-module_strip.patch index 74a4254249..e4d5407c8e 100644 --- a/target/linux/generic/patches-3.10/204-module_strip.patch +++ b/target/linux/generic/patches-3.10/204-module_strip.patch @@ -78,7 +78,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #ifdef MODULE #define __MODULE_INFO(tag, name, info) \ static const char __UNIQUE_ID(name)[] \ -@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[] +@@ -23,8 +33,7 @@ static const char __UNIQUE_ID(name)[] = __stringify(tag) "=" info #else /* !MODULE */ /* This struct is here for syntactic coherency, it is not used */ @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org> #endif #define __MODULE_PARM_TYPE(name, _type) \ __MODULE_INFO(parmtype, name##type, #name ":" _type) -@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[] +@@ -32,7 +41,7 @@ static const char __UNIQUE_ID(name)[] /* One for each parameter, describing how to use it. Some files do multiple of these per line, so can't just use MODULE_INFO. */ #define MODULE_PARM_DESC(_parm, desc) \ diff --git a/target/linux/generic/patches-3.10/220-gc_sections.patch b/target/linux/generic/patches-3.10/220-gc_sections.patch index f541deb899..54caa855c9 100644 --- a/target/linux/generic/patches-3.10/220-gc_sections.patch +++ b/target/linux/generic/patches-3.10/220-gc_sections.patch @@ -475,7 +475,7 @@ __stop_unwind_tab = .; } #endif -@@ -162,24 +162,24 @@ SECTIONS +@@ -179,24 +179,24 @@ SECTIONS } .init.arch.info : { __arch_info_begin = .; diff --git a/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch b/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch index ff38fc6085..dc491ffebc 100644 --- a/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch +++ b/target/linux/generic/patches-3.10/230-openwrt_lzma_options.patch @@ -1,6 +1,6 @@ --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) +@@ -303,7 +303,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ diff --git a/target/linux/generic/patches-3.10/259-regmap_dynamic.patch b/target/linux/generic/patches-3.10/259-regmap_dynamic.patch index 36e8b61c27..5282b076c1 100644 --- a/target/linux/generic/patches-3.10/259-regmap_dynamic.patch +++ b/target/linux/generic/patches-3.10/259-regmap_dynamic.patch @@ -31,7 +31,7 @@ bool --- a/include/linux/regmap.h +++ b/include/linux/regmap.h -@@ -45,7 +45,7 @@ struct reg_default { +@@ -46,7 +46,7 @@ struct reg_default { unsigned int def; }; diff --git a/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch b/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch index de0f1ce178..de5e9b8e8d 100644 --- a/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch +++ b/target/linux/generic/patches-3.10/300-mips_expose_boot_raw.patch @@ -8,7 +8,7 @@ Acked-by: Rob Landley <rob@landley.net> --- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -895,9 +895,6 @@ config FW_ARC +@@ -896,9 +896,6 @@ config FW_ARC config ARCH_MAY_HAVE_PC_FDC bool @@ -18,7 +18,7 @@ Acked-by: Rob Landley <rob@landley.net> config CEVT_BCM1480 bool -@@ -2391,6 +2388,18 @@ config USE_OF +@@ -2396,6 +2393,18 @@ config USE_OF select OF_EARLY_FLATTREE select IRQ_DOMAIN diff --git a/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch b/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch index 7f27548a73..7236218c20 100644 --- a/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/patches-3.10/301-mips_image_cmdline_hack.patch @@ -1,6 +1,6 @@ --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -988,6 +988,10 @@ config SYNC_R4K +@@ -993,6 +993,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n diff --git a/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch b/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch index 8d69bf2e53..89e6edcf2e 100644 --- a/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch +++ b/target/linux/generic/patches-3.10/304-mips_disable_fpu.patch @@ -8,7 +8,7 @@ Signed-off-by: Florian Fainelli <florian@openwrt.org> -- --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -976,6 +976,17 @@ config I8259 +@@ -981,6 +981,17 @@ config I8259 config MIPS_BONITO64 bool diff --git a/target/linux/generic/patches-3.10/305-mips_module_reloc.patch b/target/linux/generic/patches-3.10/305-mips_module_reloc.patch index ceae7fd039..d8cd0e59cf 100644 --- a/target/linux/generic/patches-3.10/305-mips_module_reloc.patch +++ b/target/linux/generic/patches-3.10/305-mips_module_reloc.patch @@ -1,8 +1,6 @@ -Index: linux-3.10/arch/mips/Makefile -=================================================================== ---- linux-3.10.orig/arch/mips/Makefile 2013-08-04 14:03:15.323485386 +0200 -+++ linux-3.10/arch/mips/Makefile 2013-08-04 14:03:15.379485387 +0200 -@@ -90,8 +90,13 @@ +--- a/arch/mips/Makefile ++++ b/arch/mips/Makefile +@@ -90,8 +90,13 @@ all-$(CONFIG_SYS_SUPPORTS_ZBOOT)+= vmlin cflags-y += -G 0 -mno-abicalls -fno-pic -pipe -mno-branch-likely cflags-y += -msoft-float LDFLAGS_vmlinux += -G 0 -static -n -nostdlib --gc-sections @@ -16,11 +14,9 @@ Index: linux-3.10/arch/mips/Makefile ifndef CONFIG_FUNCTION_TRACER KBUILD_CFLAGS_KERNEL += -ffunction-sections -fdata-sections -Index: linux-3.10/arch/mips/include/asm/module.h -=================================================================== ---- linux-3.10.orig/arch/mips/include/asm/module.h 2013-07-01 00:13:29.000000000 +0200 -+++ linux-3.10/arch/mips/include/asm/module.h 2013-08-04 14:03:15.383485387 +0200 -@@ -11,6 +11,11 @@ +--- a/arch/mips/include/asm/module.h ++++ b/arch/mips/include/asm/module.h +@@ -11,6 +11,11 @@ struct mod_arch_specific { const struct exception_table_entry *dbe_start; const struct exception_table_entry *dbe_end; struct mips_hi16 *r_mips_hi16_list; @@ -32,11 +28,9 @@ Index: linux-3.10/arch/mips/include/asm/module.h }; typedef uint8_t Elf64_Byte; /* Type for a 8-bit quantity. */ -Index: linux-3.10/arch/mips/kernel/module.c -=================================================================== ---- linux-3.10.orig/arch/mips/kernel/module.c 2013-07-01 00:13:29.000000000 +0200 -+++ linux-3.10/arch/mips/kernel/module.c 2013-08-04 15:31:24.995611431 +0200 -@@ -42,14 +42,222 @@ +--- a/arch/mips/kernel/module.c ++++ b/arch/mips/kernel/module.c +@@ -42,14 +42,222 @@ struct mips_hi16 { static LIST_HEAD(dbe_list); static DEFINE_SPINLOCK(dbe_lock); @@ -260,7 +254,7 @@ Index: linux-3.10/arch/mips/kernel/module.c int apply_r_mips_none(struct module *me, u32 *location, Elf_Addr v) { -@@ -63,8 +271,39 @@ +@@ -63,8 +271,39 @@ static int apply_r_mips_32_rel(struct mo return 0; } @@ -300,7 +294,7 @@ Index: linux-3.10/arch/mips/kernel/module.c if (v % 4) { pr_err("module %s: dangerous R_MIPS_26 REL relocation\n", me->name); -@@ -72,14 +311,17 @@ +@@ -72,14 +311,17 @@ static int apply_r_mips_26_rel(struct mo } if ((v & 0xf0000000) != (((unsigned long)location + 4) & 0xf0000000)) { @@ -323,7 +317,7 @@ Index: linux-3.10/arch/mips/kernel/module.c return 0; } -@@ -286,11 +528,32 @@ +@@ -286,11 +528,32 @@ int module_finalize(const Elf_Ehdr *hdr, list_add(&me->arch.dbe_list, &dbe_list); spin_unlock_irq(&dbe_lock); } diff --git a/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch b/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch index e6056fa5c4..9818677425 100644 --- a/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch +++ b/target/linux/generic/patches-3.10/306-mips_mem_functions_performance.patch @@ -1,6 +1,6 @@ --- a/arch/mips/include/asm/string.h +++ b/arch/mips/include/asm/string.h -@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ +@@ -133,11 +133,44 @@ strncmp(__const__ char *__cs, __const__ #define __HAVE_ARCH_MEMSET extern void *memset(void *__s, int __c, size_t __count); diff --git a/target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch b/target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch index 89e443708f..0f4c02779e 100644 --- a/target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch +++ b/target/linux/generic/patches-3.10/476-mtd-m25p80-allow-to-disable-small-sector-erase.patch @@ -30,7 +30,7 @@ /****************************************************************************/ struct m25p { -@@ -1022,7 +1028,7 @@ static int m25p_probe(struct spi_device +@@ -1018,7 +1024,7 @@ static int m25p_probe(struct spi_device flash->mtd._write = m25p80_write; /* prefer "small sector" erase if possible */ diff --git a/target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch b/target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch index 4767e769b6..1b814e97fd 100644 --- a/target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch +++ b/target/linux/generic/patches-3.10/504-yaffs-Mods-for-Linux-3.0-and-fix-a-typo.patch @@ -26,7 +26,7 @@ Signed-off-by: Charles Manning <cdhmanning@gmail.com> #include <linux/pagemap.h> #include <linux/mtd/mtd.h> #include <linux/interrupt.h> -@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file +@@ -236,7 +238,9 @@ static int yaffs_file_flush(struct file static int yaffs_file_flush(struct file *file); #endif diff --git a/target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch b/target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch index 7787d500a9..1ca189d2ee 100644 --- a/target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch +++ b/target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch @@ -216,7 +216,7 @@ result = yaffs_rd_chunk_tags_nand(dev,nand_chunk,buffer,&tempTags); if(memcmp(buffer,data,dev->data_bytes_per_chunk) || tempTags.obj_id != tags->obj_id || -@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct +@@ -424,7 +424,7 @@ static int yaffs_write_new_chunk(struct * lot of checks that are most likely not needed. * * Mods to the above @@ -225,7 +225,7 @@ * rest of the block. */ -@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct +@@ -486,7 +486,7 @@ static int yaffs_write_new_chunk(struct } @@ -279,7 +279,7 @@ /* Free chunks already includes softdeleted chunks. * How ever this chunk is going to soon be really deleted * which will increment free chunks. -@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t +@@ -2752,7 +2752,7 @@ int yaffs_put_chunk_in_file(yaffs_obj_t NULL); if (!tn) return YAFFS_FAIL; @@ -455,7 +455,7 @@ #ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM else if (obj->short_name[0]) { yaffs_strcpy(name, obj->short_name); -@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj, +@@ -4861,9 +4861,9 @@ int yaffs_set_attribs(yaffs_obj_t *obj, if (valid & ATTR_MODE) obj->yst_mode = attr->ia_mode; if (valid & ATTR_UID) @@ -467,7 +467,7 @@ if (valid & ATTR_ATIME) obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); -@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj, +@@ -4886,9 +4886,9 @@ int yaffs_get_attribs(yaffs_obj_t *obj, attr->ia_mode = obj->yst_mode; valid |= ATTR_MODE; diff --git a/target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch b/target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch index 476f330ddb..81d19762d4 100644 --- a/target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch +++ b/target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch @@ -8,7 +8,7 @@ static struct proc_dir_entry *my_proc_entry; static struct proc_dir_entry *debug_proc_entry; -@@ -3668,6 +3669,7 @@ static int yaffs_proc_write(struct file +@@ -3668,6 +3669,7 @@ static int yaffs_proc_write(struct file { return yaffs_proc_write_trace_options(file, buf, count, data); } diff --git a/target/linux/generic/patches-3.10/531-debloat_lzma.patch b/target/linux/generic/patches-3.10/531-debloat_lzma.patch index 9f9690f187..aa3c498016 100644 --- a/target/linux/generic/patches-3.10/531-debloat_lzma.patch +++ b/target/linux/generic/patches-3.10/531-debloat_lzma.patch @@ -124,7 +124,7 @@ /* LzmaDecode --- a/lib/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c -@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, +@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, p->needFlush = 0; } @@ -219,26 +219,26 @@ { UInt32 dicSize; Byte d; -@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzma +@@ -935,7 +883,7 @@ static SRes LzmaDec_AllocateProbs2(CLzma return SZ_OK; } -SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) --{ -- CLzmaProps propNew; -- RINOK(LzmaProps_Decode(&propNew, props, propsSize)); -- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); -- p->prop = propNew; -- return SZ_OK; --} -- --SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +static SRes LzmaDec_AllocateProbs(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) { CLzmaProps propNew; -- SizeT dicBufSize; RINOK(LzmaProps_Decode(&propNew, props, propsSize)); - RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); +@@ -943,28 +891,6 @@ SRes LzmaDec_AllocateProbs(CLzmaDec *p, + p->prop = propNew; + return SZ_OK; + } +- +-SRes LzmaDec_Allocate(CLzmaDec *p, const Byte *props, unsigned propsSize, ISzAlloc *alloc) +-{ +- CLzmaProps propNew; +- SizeT dicBufSize; +- RINOK(LzmaProps_Decode(&propNew, props, propsSize)); +- RINOK(LzmaDec_AllocateProbs2(p, &propNew, alloc)); - dicBufSize = propNew.dicSize; - if (p->dic == 0 || dicBufSize != p->dicBufSize) - { @@ -251,9 +251,12 @@ - } - } - p->dicBufSize = dicBufSize; - p->prop = propNew; - return SZ_OK; - } +- p->prop = propNew; +- return SZ_OK; +-} + + SRes LzmaDecode(Byte *dest, SizeT *destLen, const Byte *src, SizeT *srcLen, + const Byte *propData, unsigned propSize, ELzmaFinishMode finishMode, --- a/include/linux/lzma/LzmaEnc.h +++ b/include/linux/lzma/LzmaEnc.h @@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps @@ -597,7 +600,7 @@ void MatchFinder_Construct(CMatchFinder *p); /* Conditions: -@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, +@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc); void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); @@ -686,7 +689,7 @@ { memmove(p->bufferBase, p->buffer - p->keepSizeBefore, -@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder +@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder p->buffer = p->bufferBase + p->keepSizeBefore; } diff --git a/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch b/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch index bcdc58fca8..a4331097f7 100644 --- a/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch +++ b/target/linux/generic/patches-3.10/600-netfilter_layer7_2.22.patch @@ -30,7 +30,7 @@ depends on NETFILTER_ADVANCED --- a/net/netfilter/Makefile +++ b/net/netfilter/Makefile -@@ -134,6 +134,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) +@@ -134,6 +134,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_RECENT) obj-$(CONFIG_NETFILTER_XT_MATCH_SCTP) += xt_sctp.o obj-$(CONFIG_NETFILTER_XT_MATCH_SOCKET) += xt_socket.o obj-$(CONFIG_NETFILTER_XT_MATCH_STATE) += xt_state.o diff --git a/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch b/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch index 7cb1e2af73..ecd46b6a2b 100644 --- a/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch +++ b/target/linux/generic/patches-3.10/604-netfilter_conntrack_flush.patch @@ -1,6 +1,6 @@ --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c -@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, +@@ -268,10 +268,34 @@ static int ct_open(struct inode *inode, sizeof(struct ct_iter_state)); } diff --git a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch index 140889d867..11595a18da 100644 --- a/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch +++ b/target/linux/generic/patches-3.10/610-netfilter_match_bypass_default_checks.patch @@ -76,10 +76,11 @@ counters = alloc_counters(table); if (IS_ERR(counters)) -@@ -961,6 +990,14 @@ copy_entries_to_user(unsigned int total_ +@@ -960,6 +989,14 @@ copy_entries_to_user(unsigned int total_ + ret = -EFAULT; goto free_counters; } - ++ + flags = e->ip.flags & IPT_F_MASK; + if (copy_to_user(userptr + off + + offsetof(struct ipt_entry, ip.flags), @@ -87,7 +88,6 @@ + ret = -EFAULT; + goto free_counters; + } -+ + for (i = sizeof(struct ipt_entry); i < e->target_offset; - i += m->u.match_size) { diff --git a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch index 49986da1b2..5f88e6b8b6 100644 --- a/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch +++ b/target/linux/generic/patches-3.10/643-bridge_remove_ipv6_dependency.patch @@ -25,7 +25,7 @@ Ethernet bridge, which means that the different Ethernet segments it --- a/net/ipv6/Makefile +++ b/net/ipv6/Makefile -@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o +@@ -44,3 +44,4 @@ obj-y += addrconf_core.o exthdrs_core.o obj-$(CONFIG_INET) += output_core.o protocol.o $(ipv6-offload) obj-$(subst m,y,$(CONFIG_IPV6)) += inet6_hashtables.o diff --git a/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch b/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch index 88038d8b67..b3a6597a57 100644 --- a/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch +++ b/target/linux/generic/patches-3.10/653-disable_netlink_trim.patch @@ -1,6 +1,6 @@ --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c -@@ -1503,27 +1503,7 @@ void netlink_detachskb(struct sock *sk, +@@ -1503,27 +1503,7 @@ void netlink_detachskb(struct sock *sk, static struct sk_buff *netlink_trim(struct sk_buff *skb, gfp_t allocation) { diff --git a/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch b/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch index e27d0a04d6..93ff7ba71d 100644 --- a/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch +++ b/target/linux/generic/patches-3.10/657-qdisc_reduce_truesize.patch @@ -24,7 +24,7 @@ commont qdiscs. } --- a/net/sched/sch_fifo.c +++ b/net/sched/sch_fifo.c -@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff +@@ -29,17 +29,21 @@ static int bfifo_enqueue(struct sk_buff static int pfifo_enqueue(struct sk_buff *skb, struct Qdisc *sch) { diff --git a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch index 0a5ca2659d..0a93341672 100644 --- a/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch +++ b/target/linux/generic/patches-3.10/670-ipv6-allow-rejecting-with-source-address-failed-policy.patch @@ -56,7 +56,7 @@ err = -EINVAL; --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c -@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX +@@ -138,6 +138,10 @@ const struct fib_prop fib_props[RTN_MAX .error = -EINVAL, .scope = RT_SCOPE_NOWHERE, }, diff --git a/target/linux/generic/patches-3.10/750-hostap_txpower.patch b/target/linux/generic/patches-3.10/750-hostap_txpower.patch index fc032a93c9..768c80f73b 100644 --- a/target/linux/generic/patches-3.10/750-hostap_txpower.patch +++ b/target/linux/generic/patches-3.10/750-hostap_txpower.patch @@ -1,6 +1,6 @@ --- a/drivers/net/wireless/hostap/hostap_ap.c +++ b/drivers/net/wireless/hostap/hostap_ap.c -@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t +@@ -2403,13 +2403,13 @@ int prism2_ap_get_sta_qual(local_info_t addr[count].sa_family = ARPHRD_ETHER; memcpy(addr[count].sa_data, sta->addr, ETH_ALEN); if (sta->last_rx_silence == 0) diff --git a/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch b/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch index 898d15d110..ff99832b99 100644 --- a/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch +++ b/target/linux/generic/patches-3.10/810-pci_disable_common_quirks.patch @@ -15,7 +15,7 @@ default y --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c -@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct +@@ -44,6 +44,7 @@ static void quirk_mmio_always_on(struct DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_BRIDGE_HOST, 8, quirk_mmio_always_on); diff --git a/target/linux/generic/patches-3.10/902-debloat_proc.patch b/target/linux/generic/patches-3.10/902-debloat_proc.patch index c94f9689dd..67ea753a10 100644 --- a/target/linux/generic/patches-3.10/902-debloat_proc.patch +++ b/target/linux/generic/patches-3.10/902-debloat_proc.patch @@ -199,7 +199,7 @@ &fib_triestat_fops)) goto out2; -@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net +@@ -2603,17 +2605,21 @@ int __net_init fib_proc_init(struct net return 0; out3: diff --git a/target/linux/generic/patches-3.10/941-ocf_20120127.patch b/target/linux/generic/patches-3.10/941-ocf_20120127.patch index 1d56450ae7..a177fdedda 100644 --- a/target/linux/generic/patches-3.10/941-ocf_20120127.patch +++ b/target/linux/generic/patches-3.10/941-ocf_20120127.patch @@ -24,7 +24,7 @@ * All of these routines try to estimate how many bits of randomness a * particular randomness source. They do this by keeping track of the * first and second order deltas of the event timings. -@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk +@@ -796,6 +806,63 @@ void add_disk_randomness(struct gendisk } #endif diff --git a/target/linux/generic/patches-3.10/950-vm_exports.patch b/target/linux/generic/patches-3.10/950-vm_exports.patch index 993d384b28..c19c3320af 100644 --- a/target/linux/generic/patches-3.10/950-vm_exports.patch +++ b/target/linux/generic/patches-3.10/950-vm_exports.patch @@ -62,7 +62,7 @@ --- a/mm/memory.c +++ b/mm/memory.c -@@ -1404,6 +1404,7 @@ void zap_page_range(struct vm_area_struc +@@ -1413,6 +1413,7 @@ void zap_page_range(struct vm_area_struc mmu_notifier_invalidate_range_end(mm, start, end); tlb_finish_mmu(&tlb, start, end); } diff --git a/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch b/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch index ae81f3f384..c7eb4c1c61 100644 --- a/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch +++ b/target/linux/generic/patches-3.10/992-mpcore_wdt_fix_watchdog_counter_loading.patch @@ -62,7 +62,7 @@ Signed-off-by: Vitaly Kuzmichev <vkuzmichev@mvista.com> { --- a/drivers/watchdog/mpcore_wdt.c +++ b/drivers/watchdog/mpcore_wdt.c -@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct +@@ -101,9 +101,7 @@ static void mpcore_wdt_keepalive(struct spin_lock(&wdt_lock); /* Assume prescale is set to 256 */ |