diff options
Diffstat (limited to 'target/linux/generic/hack-4.9')
37 files changed, 167 insertions, 516 deletions
diff --git a/target/linux/generic/hack-4.9/202-reduce_module_size.patch b/target/linux/generic/hack-4.9/202-reduce_module_size.patch index 1ec8997fab..1b4e19a4a6 100644 --- a/target/linux/generic/hack-4.9/202-reduce_module_size.patch +++ b/target/linux/generic/hack-4.9/202-reduce_module_size.patch @@ -11,8 +11,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile b/Makefile -index a40b373eba3a..984eb5907d00 100644 --- a/Makefile +++ b/Makefile @@ -407,7 +407,7 @@ KBUILD_CFLAGS_KERNEL := @@ -24,6 +22,3 @@ index a40b373eba3a..984eb5907d00 100644 # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/204-module_strip.patch b/target/linux/generic/hack-4.9/204-module_strip.patch index 5827c138e5..fd07cca066 100644 --- a/target/linux/generic/hack-4.9/204-module_strip.patch +++ b/target/linux/generic/hack-4.9/204-module_strip.patch @@ -12,8 +12,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> scripts/mod/modpost.c | 12 ++++++++++++ 5 files changed, 43 insertions(+), 9 deletions(-) -diff --git a/include/linux/module.h b/include/linux/module.h -index 0c3207d26ac0..08b58474bfd2 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -159,6 +159,7 @@ extern void cleanup_module(void); @@ -40,7 +38,7 @@ index 0c3207d26ac0..08b58474bfd2 100644 /* Creates an alias so file2alias.c can find device table. */ #define MODULE_DEVICE_TABLE(type, name) \ extern const typeof(name) __mod_##type##__##name##_device_table \ -@@ -234,7 +235,9 @@ extern const typeof(name) __mod_##type##__##name##_device_table \ +@@ -234,7 +235,9 @@ extern const typeof(name) __mod_##type## */ #if defined(MODULE) || !defined(CONFIG_SYSFS) @@ -51,7 +49,7 @@ index 0c3207d26ac0..08b58474bfd2 100644 #else #define MODULE_VERSION(_version) \ static struct module_version_attribute ___modver_attr = { \ -@@ -256,7 +259,7 @@ extern const typeof(name) __mod_##type##__##name##_device_table \ +@@ -256,7 +259,7 @@ extern const typeof(name) __mod_##type## /* Optional firmware file (or files) needed by the module * format is simply firmware file name. Multiple firmware * files require multiple MODULE_FIRMWARE() specifiers */ @@ -60,8 +58,6 @@ index 0c3207d26ac0..08b58474bfd2 100644 struct notifier_block; -diff --git a/include/linux/moduleparam.h b/include/linux/moduleparam.h -index 52666d90ca94..f0db3592906a 100644 --- a/include/linux/moduleparam.h +++ b/include/linux/moduleparam.h @@ -16,6 +16,16 @@ @@ -81,7 +77,7 @@ index 52666d90ca94..f0db3592906a 100644 #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 */ @@ -91,7 +87,7 @@ index 52666d90ca94..f0db3592906a 100644 #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) \ @@ -100,11 +96,9 @@ index 52666d90ca94..f0db3592906a 100644 struct kernel_param; -diff --git a/init/Kconfig b/init/Kconfig -index 34407f15e6d3..9f2c0cabbc97 100644 --- a/init/Kconfig +++ b/init/Kconfig -@@ -2095,6 +2095,13 @@ config TRIM_UNUSED_KSYMS +@@ -2115,6 +2115,13 @@ config TRIM_UNUSED_KSYMS If unsure, or if you need to build out-of-tree modules, say N. @@ -118,11 +112,9 @@ index 34407f15e6d3..9f2c0cabbc97 100644 endif # MODULES config MODULES_TREE_LOOKUP -diff --git a/kernel/module.c b/kernel/module.c -index 0e54d5bf0097..80b5ac4181c6 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -2945,9 +2945,11 @@ static struct module *setup_load_info(struct load_info *info, int flags) +@@ -2945,9 +2945,11 @@ static struct module *setup_load_info(st static int check_modinfo(struct module *mod, struct load_info *info, int flags) { @@ -135,7 +127,7 @@ index 0e54d5bf0097..80b5ac4181c6 100644 if (flags & MODULE_INIT_IGNORE_VERMAGIC) modmagic = NULL; -@@ -2968,6 +2970,7 @@ static int check_modinfo(struct module *mod, struct load_info *info, int flags) +@@ -2968,6 +2970,7 @@ static int check_modinfo(struct module * mod->name); add_taint_module(mod, TAINT_OOT_MODULE, LOCKDEP_STILL_OK); } @@ -143,8 +135,6 @@ index 0e54d5bf0097..80b5ac4181c6 100644 if (get_modinfo(info, "staging")) { add_taint_module(mod, TAINT_CRAP, LOCKDEP_STILL_OK); -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index bd8349759095..80f214adbe44 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -1964,7 +1964,9 @@ static void read_symbols(char *modname) @@ -157,7 +147,7 @@ index bd8349759095..80f214adbe44 100644 } if (!is_vmlinux(modname) || (is_vmlinux(modname) && vmlinux_section_warnings)) -@@ -2108,7 +2110,9 @@ static void add_header(struct buffer *b, struct module *mod) +@@ -2108,7 +2110,9 @@ static void add_header(struct buffer *b, buf_printf(b, "#include <linux/vermagic.h>\n"); buf_printf(b, "#include <linux/compiler.h>\n"); buf_printf(b, "\n"); @@ -167,7 +157,7 @@ index bd8349759095..80f214adbe44 100644 buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2125,16 +2129,20 @@ static void add_header(struct buffer *b, struct module *mod) +@@ -2125,16 +2129,20 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -188,7 +178,7 @@ index bd8349759095..80f214adbe44 100644 } /* In kernel, this size is defined in linux/module.h; -@@ -2238,11 +2246,13 @@ static void add_depends(struct buffer *b, struct module *mod, +@@ -2238,11 +2246,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -212,6 +202,3 @@ index bd8349759095..80f214adbe44 100644 add_srcversion(&buf, mod); sprintf(fname, "%s.mod.c", mod->name); --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/207-disable-modorder.patch b/target/linux/generic/hack-4.9/207-disable-modorder.patch index d8ab95532d..354052d8b4 100644 --- a/target/linux/generic/hack-4.9/207-disable-modorder.patch +++ b/target/linux/generic/hack-4.9/207-disable-modorder.patch @@ -13,11 +13,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> scripts/Makefile.build | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) -diff --git a/Makefile b/Makefile -index 984eb5907d00..cce1c68e48ae 100644 --- a/Makefile +++ b/Makefile -@@ -1193,7 +1193,6 @@ all: modules +@@ -1196,7 +1196,6 @@ all: modules PHONY += modules modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin @@ -25,7 +23,7 @@ index 984eb5907d00..cce1c68e48ae 100644 @$(kecho) ' Building modules, stage 2.'; $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.fwinst obj=firmware __fw_modbuild -@@ -1223,7 +1222,6 @@ _modinst_: +@@ -1226,7 +1225,6 @@ _modinst_: rm -f $(MODLIB)/build ; \ ln -s $(CURDIR) $(MODLIB)/build ; \ fi @@ -33,8 +31,6 @@ index 984eb5907d00..cce1c68e48ae 100644 @cp -f $(objtree)/modules.builtin $(MODLIB)/ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modinst -diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index 7675d11ee65e..108d73273788 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -93,7 +93,7 @@ modorder-target := $(obj)/modules.order @@ -46,6 +42,3 @@ index 7675d11ee65e..108d73273788 100644 $(subdir-ym) $(always) @: --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch b/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch index ac6e12f1a8..bdf4114aaa 100644 --- a/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch +++ b/target/linux/generic/hack-4.9/210-darwin_scripts_include.patch @@ -13,11 +13,9 @@ Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> 4 files changed, 3018 insertions(+) create mode 100644 scripts/mod/elf.h -diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile -index 90a091b6ae4d..f9620652e70a 100644 --- a/scripts/kconfig/Makefile +++ b/scripts/kconfig/Makefile -@@ -163,6 +163,9 @@ check-lxdialog := $(srctree)/$(src)/lxdialog/check-lxdialog.sh +@@ -163,6 +163,9 @@ check-lxdialog := $(srctree)/$(src)/lxd # we really need to do so. (Do not call gcc as part of make mrproper) HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \ -DLOCALE @@ -27,9 +25,6 @@ index 90a091b6ae4d..f9620652e70a 100644 # =========================================================================== # Shared Makefile for the various kconfig executables: -diff --git a/scripts/mod/elf.h b/scripts/mod/elf.h -new file mode 100644 -index 000000000000..036a176345eb --- /dev/null +++ b/scripts/mod/elf.h @@ -0,0 +1,3007 @@ @@ -3040,8 +3035,6 @@ index 000000000000..036a176345eb +#define R_TILEGX_NUM 130 + +#endif /* elf.h */ -diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c -index a4fd71d71d65..5ec3740ebb3c 100644 --- a/scripts/mod/mk_elfconfig.c +++ b/scripts/mod/mk_elfconfig.c @@ -1,7 +1,11 @@ @@ -3056,8 +3049,6 @@ index a4fd71d71d65..5ec3740ebb3c 100644 int main(int argc, char **argv) -diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h -index 6a5e1515123b..237c50d2ec6c 100644 --- a/scripts/mod/modpost.h +++ b/scripts/mod/modpost.h @@ -7,7 +7,11 @@ @@ -3072,6 +3063,3 @@ index 6a5e1515123b..237c50d2ec6c 100644 #include "elfconfig.h" --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/211-host_tools_portability.patch b/target/linux/generic/hack-4.9/211-host_tools_portability.patch index bb71a293c4..e6fd328431 100644 --- a/target/linux/generic/hack-4.9/211-host_tools_portability.patch +++ b/target/linux/generic/hack-4.9/211-host_tools_portability.patch @@ -10,18 +10,14 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> tools/perf/pmu-events/json.c | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) -diff --git a/tools/build/Build.include b/tools/build/Build.include -index 1dcb95e76f70..9d6f97a7c1aa 100644 --- a/tools/build/Build.include +++ b/tools/build/Build.include -@@ -95,4 +95,4 @@ cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $(CXXFLAGS) -D"BUILD_STR(s)=\#s" $(CXXFLAG +@@ -95,4 +95,4 @@ cxx_flags = -Wp,-MD,$(depfile),-MT,$@ $( ### ## HOSTCC C flags -host_c_flags = -Wp,-MD,$(depfile),-MT,$@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj)) +host_c_flags = -MD -MF $(depfile) -MT $@ $(CHOSTFLAGS) -D"BUILD_STR(s)=\#s" $(CHOSTFLAGS_$(basetarget).o) $(CHOSTFLAGS_$(obj)) -diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c -index 41611d7f9873..51333bee190c 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -35,6 +35,7 @@ @@ -32,8 +28,6 @@ index 41611d7f9873..51333bee190c 100644 #include <ctype.h> #include <unistd.h> #include <stdarg.h> -diff --git a/tools/perf/pmu-events/json.c b/tools/perf/pmu-events/json.c -index f67bbb0aa36e..a72c70a97fab 100644 --- a/tools/perf/pmu-events/json.c +++ b/tools/perf/pmu-events/json.c @@ -38,7 +38,6 @@ @@ -44,6 +38,3 @@ index f67bbb0aa36e..a72c70a97fab 100644 static char *mapfile(const char *fn, size_t *size) --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/212-byteshift_portability.patch b/target/linux/generic/hack-4.9/212-byteshift_portability.patch index ccecd5745a..6def12d0cf 100644 --- a/target/linux/generic/hack-4.9/212-byteshift_portability.patch +++ b/target/linux/generic/hack-4.9/212-byteshift_portability.patch @@ -12,8 +12,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> 3 files changed, 30 insertions(+) create mode 100644 tools/include/tools/linux_types.h -diff --git a/tools/include/tools/be_byteshift.h b/tools/include/tools/be_byteshift.h -index 84c17d836578..ed9932e97bd4 100644 --- a/tools/include/tools/be_byteshift.h +++ b/tools/include/tools/be_byteshift.h @@ -1,6 +1,10 @@ @@ -27,8 +25,6 @@ index 84c17d836578..ed9932e97bd4 100644 #include <stdint.h> static inline uint16_t __get_unaligned_be16(const uint8_t *p) -diff --git a/tools/include/tools/le_byteshift.h b/tools/include/tools/le_byteshift.h -index 8fe9f2488ec7..2e387b5226d9 100644 --- a/tools/include/tools/le_byteshift.h +++ b/tools/include/tools/le_byteshift.h @@ -1,6 +1,10 @@ @@ -42,9 +38,6 @@ index 8fe9f2488ec7..2e387b5226d9 100644 #include <stdint.h> static inline uint16_t __get_unaligned_le16(const uint8_t *p) -diff --git a/tools/include/tools/linux_types.h b/tools/include/tools/linux_types.h -new file mode 100644 -index 000000000000..f07ef8293ebc --- /dev/null +++ b/tools/include/tools/linux_types.h @@ -0,0 +1,22 @@ @@ -70,6 +63,3 @@ index 000000000000..f07ef8293ebc +typedef uint64_t __le64; + +#endif --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/214-spidev_h_portability.patch b/target/linux/generic/hack-4.9/214-spidev_h_portability.patch index e1467b915b..23914d633b 100644 --- a/target/linux/generic/hack-4.9/214-spidev_h_portability.patch +++ b/target/linux/generic/hack-4.9/214-spidev_h_portability.patch @@ -11,8 +11,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> include/uapi/linux/spi/spidev.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/include/uapi/linux/spi/spidev.h b/include/uapi/linux/spi/spidev.h -index dd5f21e75805..e5e8fea8b068 100644 --- a/include/uapi/linux/spi/spidev.h +++ b/include/uapi/linux/spi/spidev.h @@ -111,7 +111,7 @@ struct spi_ioc_transfer { @@ -24,6 +22,3 @@ index dd5f21e75805..e5e8fea8b068 100644 ? ((N)*(sizeof (struct spi_ioc_transfer))) : 0) #define SPI_IOC_MESSAGE(N) _IOW(SPI_IOC_MAGIC, 0, char[SPI_MSGSIZE(N)]) --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/220-gc_sections.patch b/target/linux/generic/hack-4.9/220-gc_sections.patch index d6f7da0e72..8eed08ea3d 100644 --- a/target/linux/generic/hack-4.9/220-gc_sections.patch +++ b/target/linux/generic/hack-4.9/220-gc_sections.patch @@ -19,11 +19,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> include/asm-generic/vmlinux.lds.h | 63 ++++++++++++++++++++------------------- 7 files changed, 55 insertions(+), 51 deletions(-) -diff --git a/Makefile b/Makefile -index 42435dfa5fc3..66cdf6a59b53 100644 --- a/Makefile +++ b/Makefile -@@ -410,6 +410,11 @@ KBUILD_AFLAGS_MODULE := -DMODULE +@@ -409,6 +409,11 @@ KBUILD_AFLAGS_MODULE := -DMODULE KBUILD_CFLAGS_MODULE := -DMODULE KBUILD_LDFLAGS_MODULE = -T $(srctree)/scripts/module-common.lds $(if $(CONFIG_PROFILING),,-s) @@ -35,9 +33,9 @@ index 42435dfa5fc3..66cdf6a59b53 100644 # Read KERNELRELEASE from include/config/kernel.release (if it exists) KERNELRELEASE = $(shell cat include/config/kernel.release 2> /dev/null) KERNELVERSION = $(VERSION)$(if $(PATCHLEVEL),.$(PATCHLEVEL)$(if $(SUBLEVEL),.$(SUBLEVEL)))$(EXTRAVERSION) -@@ -631,11 +636,6 @@ include arch/$(SRCARCH)/Makefile - KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks,) - KBUILD_CFLAGS += $(call cc-disable-warning,frame-address,) +@@ -633,11 +638,6 @@ KBUILD_CFLAGS += $(call cc-disable-warni + KBUILD_CFLAGS += $(call cc-disable-warning, format-overflow) + KBUILD_CFLAGS += $(call cc-disable-warning, int-in-bool-context) -ifdef CONFIG_LD_DEAD_CODE_DATA_ELIMINATION -KBUILD_CFLAGS += $(call cc-option,-ffunction-sections,) @@ -47,8 +45,6 @@ index 42435dfa5fc3..66cdf6a59b53 100644 ifdef CONFIG_CC_OPTIMIZE_FOR_SIZE KBUILD_CFLAGS += -Os $(call cc-disable-warning,maybe-uninitialized,) $(EXTRA_OPTIMIZATION) else -diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig -index b5d529fdffab..7f69418bf02c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -81,6 +81,7 @@ config ARM @@ -59,8 +55,6 @@ index b5d529fdffab..7f69418bf02c 100644 select MODULES_USE_ELF_REL select NO_BOOTMEM select OF_EARLY_FLATTREE if OF -diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile -index d50430c40045..6bdeb009a46d 100644 --- a/arch/arm/boot/compressed/Makefile +++ b/arch/arm/boot/compressed/Makefile @@ -102,6 +102,7 @@ ifeq ($(CONFIG_FUNCTION_TRACER),y) @@ -71,8 +65,6 @@ index d50430c40045..6bdeb009a46d 100644 # -fstack-protector-strong triggers protection checks in this code, # but it is being used too early to link to meaningful stack_chk logic. -diff --git a/arch/arm/kernel/vmlinux.lds.S b/arch/arm/kernel/vmlinux.lds.S -index f7f55df0bf7b..e9d70c92d99f 100644 --- a/arch/arm/kernel/vmlinux.lds.S +++ b/arch/arm/kernel/vmlinux.lds.S @@ -17,7 +17,7 @@ @@ -177,8 +169,6 @@ index f7f55df0bf7b..e9d70c92d99f 100644 __pv_table_end = .; } .init.data : { -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 3a97487b8b81..05e7bfeab2f9 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig @@ -55,6 +55,7 @@ config MIPS @@ -189,8 +179,6 @@ index 3a97487b8b81..05e7bfeab2f9 100644 select CPU_PM if CPU_IDLE select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST select ARCH_BINFMT_ELF_STATE -diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S -index d5de67591735..de5f682b5597 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -71,7 +71,7 @@ SECTIONS @@ -211,8 +199,6 @@ index d5de67591735..de5f682b5597 100644 __mips_machines_end = .; } -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index 31e1d639abed..83784d9492b1 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -114,7 +114,7 @@ @@ -433,6 +419,3 @@ index 31e1d639abed..83784d9492b1 100644 VMLINUX_SYMBOL(__setup_end) = .; #define INIT_CALLS_LEVEL(level) \ --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/221-module_exports.patch b/target/linux/generic/hack-4.9/221-module_exports.patch index 301eb3b2b4..016cb62a4c 100644 --- a/target/linux/generic/hack-4.9/221-module_exports.patch +++ b/target/linux/generic/hack-4.9/221-module_exports.patch @@ -11,8 +11,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> scripts/Makefile.build | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) -diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index 83784d9492b1..189b5c7a0758 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -54,6 +54,16 @@ @@ -67,8 +65,6 @@ index 83784d9492b1..189b5c7a0758 100644 *(.discard) \ *(.discard.*) \ } -diff --git a/include/linux/export.h b/include/linux/export.h -index 2a0f61fbc731..889331d9643d 100644 --- a/include/linux/export.h +++ b/include/linux/export.h @@ -53,12 +53,19 @@ extern struct module __this_module; @@ -92,11 +88,9 @@ index 2a0f61fbc731..889331d9643d 100644 = VMLINUX_SYMBOL_STR(sym); \ static const struct kernel_symbol __ksymtab_##sym \ __used \ -diff --git a/scripts/Makefile.build b/scripts/Makefile.build -index 108d73273788..76a0e450123c 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build -@@ -398,7 +398,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always) +@@ -398,7 +398,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $( # Linker scripts preprocessor (.lds.S -> .lds) # --------------------------------------------------------------------------- quiet_cmd_cpp_lds_S = LDS $@ @@ -105,6 +99,3 @@ index 108d73273788..76a0e450123c 100644 -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $< $(obj)/%.lds: $(src)/%.lds.S FORCE --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch b/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch index d20f3aa693..b3c444265d 100644 --- a/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch +++ b/target/linux/generic/hack-4.9/230-openwrt_lzma_options.patch @@ -11,11 +11,9 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> scripts/gen_initramfs_list.sh | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) -diff --git a/lib/decompress.c b/lib/decompress.c -index 62696dff5730..d91a26e1a1b2 100644 --- a/lib/decompress.c +++ b/lib/decompress.c -@@ -48,6 +48,7 @@ static const struct compress_format compressed_formats[] __initconst = { +@@ -48,6 +48,7 @@ static const struct compress_format comp { {0x1f, 0x9e}, "gzip", gunzip }, { {0x42, 0x5a}, "bzip2", bunzip2 }, { {0x5d, 0x00}, "lzma", unlzma }, @@ -23,11 +21,9 @@ index 62696dff5730..d91a26e1a1b2 100644 { {0xfd, 0x37}, "xz", unxz }, { {0x89, 0x4c}, "lzo", unlzo }, { {0x02, 0x21}, "lz4", unlz4 }, -diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 0a07f9014944..5324c072c598 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) | \ +@@ -344,7 +344,7 @@ cmd_bzip2 = (cat $(filter-out FORCE,$^) quiet_cmd_lzma = LZMA $@ cmd_lzma = (cat $(filter-out FORCE,$^) | \ @@ -36,8 +32,6 @@ index 0a07f9014944..5324c072c598 100644 (rm -f $@ ; false) quiet_cmd_lzo = LZO $@ -diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh -index 0055b07b03b6..7710113e6a72 100755 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh @@ -229,7 +229,7 @@ cpio_list= @@ -75,6 +69,3 @@ index 0055b07b03b6..7710113e6a72 100755 || (rm -f ${output_file} ; false) fi [ -z ${cpio_file} ] && rm ${cpio_tfile} --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/250-netfilter_depends.patch b/target/linux/generic/hack-4.9/250-netfilter_depends.patch index 108cf2ca86..f6e1c1d303 100644 --- a/target/linux/generic/hack-4.9/250-netfilter_depends.patch +++ b/target/linux/generic/hack-4.9/250-netfilter_depends.patch @@ -7,8 +7,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/netfilter/Kconfig | 2 -- 1 file changed, 2 deletions(-) -diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index 82af5ba64088..65fe84db77ec 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -218,7 +218,6 @@ config NF_CONNTRACK_FTP @@ -27,6 +25,3 @@ index 82af5ba64088..65fe84db77ec 100644 default m if NETFILTER_ADVANCED=n ---help--- This option adds a `TCPMSS' target, which allows you to alter the --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/251-sound_kconfig.patch b/target/linux/generic/hack-4.9/251-sound_kconfig.patch index 010af75244..d01bdfb9b3 100644 --- a/target/linux/generic/hack-4.9/251-sound_kconfig.patch +++ b/target/linux/generic/hack-4.9/251-sound_kconfig.patch @@ -14,8 +14,6 @@ Signed-off-by: John Crispin <john@phrozen.org> sound/core/Kconfig | 4 ++-- 7 files changed, 25 insertions(+), 20 deletions(-) -diff --git a/crypto/Kconfig b/crypto/Kconfig -index 84d71482bf08..e3552d1c1b84 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -32,7 +32,7 @@ config CRYPTO_FIPS @@ -63,8 +61,6 @@ index 84d71482bf08..e3552d1c1b84 100644 select CRYPTO_RNG2 select CRYPTO_ALGAPI -diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig -index b5c48a8d485f..6cb52081b9ef 100644 --- a/drivers/bcma/Kconfig +++ b/drivers/bcma/Kconfig @@ -17,6 +17,7 @@ config BCMA @@ -75,8 +71,6 @@ index b5c48a8d485f..6cb52081b9ef 100644 config BCMA_HOST_PCI_POSSIBLE bool -diff --git a/drivers/ssb/Kconfig b/drivers/ssb/Kconfig -index d8e4219c2324..a20c168cb7c2 100644 --- a/drivers/ssb/Kconfig +++ b/drivers/ssb/Kconfig @@ -29,6 +29,7 @@ config SSB_SPROM @@ -96,11 +90,9 @@ index d8e4219c2324..a20c168cb7c2 100644 config SSB_PCMCIAHOST_POSSIBLE bool -diff --git a/lib/Kconfig b/lib/Kconfig -index 260a80e313b9..d1b788fff727 100644 --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -334,16 +334,16 @@ config BCH_CONST_T +@@ -340,16 +340,16 @@ config BCH_CONST_T # Textsearch support is select'ed if needed # config TEXTSEARCH @@ -121,8 +113,6 @@ index 260a80e313b9..d1b788fff727 100644 config BTREE bool -diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig -index e8d56d9a4df2..0fb924661988 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -10,7 +10,7 @@ config NETFILTER_INGRESS @@ -134,8 +124,6 @@ index e8d56d9a4df2..0fb924661988 100644 config NETFILTER_NETLINK_ACCT tristate "Netfilter NFACCT over NFNETLINK interface" -diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig -index 6c606120abfe..bd299de9440c 100644 --- a/net/wireless/Kconfig +++ b/net/wireless/Kconfig @@ -1,5 +1,5 @@ @@ -187,8 +175,6 @@ index 6c606120abfe..bd299de9440c 100644 config LIB80211_DEBUG bool "lib80211 debugging messages" -diff --git a/sound/core/Kconfig b/sound/core/Kconfig -index 9749f9e8b45c..9639a67e7e9b 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig @@ -16,13 +16,13 @@ config SND_DMAENGINE_PCM @@ -207,6 +193,3 @@ index 9749f9e8b45c..9639a67e7e9b 100644 config SND_JACK bool --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/259-regmap_dynamic.patch b/target/linux/generic/hack-4.9/259-regmap_dynamic.patch index a6801125b4..85c9d79159 100644 --- a/target/linux/generic/hack-4.9/259-regmap_dynamic.patch +++ b/target/linux/generic/hack-4.9/259-regmap_dynamic.patch @@ -12,8 +12,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> include/linux/regmap.h | 2 +- 4 files changed, 22 insertions(+), 10 deletions(-) -diff --git a/drivers/base/regmap/Kconfig b/drivers/base/regmap/Kconfig -index 48b3fc1ee514..c4cb7592392b 100644 --- a/drivers/base/regmap/Kconfig +++ b/drivers/base/regmap/Kconfig @@ -3,9 +3,8 @@ @@ -56,8 +54,6 @@ index 48b3fc1ee514..c4cb7592392b 100644 config REGMAP_IRQ + select REGMAP bool -diff --git a/drivers/base/regmap/Makefile b/drivers/base/regmap/Makefile -index 6271ea9b758a..f23c58a050aa 100644 --- a/drivers/base/regmap/Makefile +++ b/drivers/base/regmap/Makefile @@ -1,10 +1,14 @@ @@ -79,8 +75,6 @@ index 6271ea9b758a..f23c58a050aa 100644 obj-$(CONFIG_REGMAP_AC97) += regmap-ac97.o obj-$(CONFIG_REGMAP_I2C) += regmap-i2c.o obj-$(CONFIG_REGMAP_SPI) += regmap-spi.o -diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c -index ae63bb0875ea..2ac56b4f525e 100644 --- a/drivers/base/regmap/regmap.c +++ b/drivers/base/regmap/regmap.c @@ -13,6 +13,7 @@ @@ -97,8 +91,6 @@ index ae63bb0875ea..2ac56b4f525e 100644 postcore_initcall(regmap_initcall); + +MODULE_LICENSE("GPL"); -diff --git a/include/linux/regmap.h b/include/linux/regmap.h -index f6673132431d..95c7db29448b 100644 --- a/include/linux/regmap.h +++ b/include/linux/regmap.h @@ -135,7 +135,7 @@ struct reg_sequence { @@ -110,6 +102,3 @@ index f6673132431d..95c7db29448b 100644 enum regmap_endian { /* Unspecified -> 0 -> Backwards compatible default */ --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch b/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch index 756cb885d3..f2570f5988 100644 --- a/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch +++ b/target/linux/generic/hack-4.9/260-crypto_test_dependencies.patch @@ -12,8 +12,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> crypto/algboss.c | 4 ++++ 2 files changed, 10 insertions(+), 7 deletions(-) -diff --git a/crypto/Kconfig b/crypto/Kconfig -index e3552d1c1b84..17be110ad162 100644 --- a/crypto/Kconfig +++ b/crypto/Kconfig @@ -132,12 +132,12 @@ config CRYPTO_MANAGER @@ -43,11 +41,9 @@ index e3552d1c1b84..17be110ad162 100644 help Disable run-time self tests that normally take place at algorithm registration. -diff --git a/crypto/algboss.c b/crypto/algboss.c -index 6e39d9c05b98..4bde25d62ec7 100644 --- a/crypto/algboss.c +++ b/crypto/algboss.c -@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struct crypto_alg *alg) +@@ -248,12 +248,16 @@ static int cryptomgr_schedule_test(struc type = alg->cra_flags; /* This piece of crap needs to disappear into per-type test hooks. */ @@ -64,6 +60,3 @@ index 6e39d9c05b98..4bde25d62ec7 100644 param->type = type; --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/280-rfkill-stubs.patch b/target/linux/generic/hack-4.9/280-rfkill-stubs.patch index 29f3463f0b..b4dcb45cf0 100644 --- a/target/linux/generic/hack-4.9/280-rfkill-stubs.patch +++ b/target/linux/generic/hack-4.9/280-rfkill-stubs.patch @@ -13,8 +13,6 @@ Signed-off-by: John Crispin <john@phrozen.org> net/rfkill/Makefile | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) -diff --git a/include/linux/rfkill.h b/include/linux/rfkill.h -index e6a0031d1b1f..21cf4dab0b9a 100644 --- a/include/linux/rfkill.h +++ b/include/linux/rfkill.h @@ -64,7 +64,7 @@ struct rfkill_ops { @@ -26,8 +24,6 @@ index e6a0031d1b1f..21cf4dab0b9a 100644 /** * rfkill_alloc - allocate rfkill structure * @name: name of the struct -- the string is not copied internally -diff --git a/net/Makefile b/net/Makefile -index 4cafaa2b4667..6566175e6c0a 100644 --- a/net/Makefile +++ b/net/Makefile @@ -51,7 +51,7 @@ obj-$(CONFIG_MAC80211) += mac80211/ @@ -39,8 +35,6 @@ index 4cafaa2b4667..6566175e6c0a 100644 obj-$(CONFIG_NET_9P) += 9p/ obj-$(CONFIG_CAIF) += caif/ ifneq ($(CONFIG_DCB),) -diff --git a/net/rfkill/Kconfig b/net/rfkill/Kconfig -index 868f1ad0415a..159b6ebeacd8 100644 --- a/net/rfkill/Kconfig +++ b/net/rfkill/Kconfig @@ -1,7 +1,11 @@ @@ -88,8 +82,6 @@ index 868f1ad0415a..159b6ebeacd8 100644 depends on GPIOLIB || COMPILE_TEST default n help -diff --git a/net/rfkill/Makefile b/net/rfkill/Makefile -index 311768783f4a..dbb01a8645af 100644 --- a/net/rfkill/Makefile +++ b/net/rfkill/Makefile @@ -4,6 +4,6 @@ @@ -100,6 +92,3 @@ index 311768783f4a..dbb01a8645af 100644 +obj-$(CONFIG_RFKILL_FULL) += rfkill.o obj-$(CONFIG_RFKILL_REGULATOR) += rfkill-regulator.o obj-$(CONFIG_RFKILL_GPIO) += rfkill-gpio.o --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch index 0c1e30287b..a3df4fbe3a 100644 --- a/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch +++ b/target/linux/generic/hack-4.9/301-mips_image_cmdline_hack.patch @@ -8,11 +8,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> arch/mips/kernel/head.S | 6 ++++++ 2 files changed, 10 insertions(+) -diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig -index 6a56d75f7e8b..03fbb7b46e7f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig -@@ -1149,6 +1149,10 @@ config SYNC_R4K +@@ -1150,6 +1150,10 @@ config SYNC_R4K config MIPS_MACHINE def_bool n @@ -23,8 +21,6 @@ index 6a56d75f7e8b..03fbb7b46e7f 100644 config NO_IOPORT_MAP def_bool n -diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S -index cf052204eb0a..f7327fae5473 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S @@ -79,6 +79,12 @@ FEXPORT(__kernel_entry) @@ -40,6 +36,3 @@ index cf052204eb0a..f7327fae5473 100644 __REF NESTED(kernel_entry, 16, sp) # kernel entry point --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch b/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch index 4fe69361b9..c22a4823fe 100644 --- a/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch +++ b/target/linux/generic/hack-4.9/321-powerpc_crtsavres_prereq.patch @@ -14,8 +14,6 @@ Signed-off-by: Alexandros C. Couloumbis <alex@ozo.com> arch/powerpc/Makefile | 1 - 1 file changed, 1 deletion(-) -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index 617dece67924..1146daa8e4c2 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile @@ -179,7 +179,6 @@ else @@ -26,6 +24,3 @@ index 617dece67924..1146daa8e4c2 100644 ifeq ($(CONFIG_476FPE_ERR46),y) KBUILD_LDFLAGS_MODULE += --ppc476-workaround \ --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/531-debloat_lzma.patch b/target/linux/generic/hack-4.9/531-debloat_lzma.patch index f8d9d15de5..2e453cc2f2 100644 --- a/target/linux/generic/hack-4.9/531-debloat_lzma.patch +++ b/target/linux/generic/hack-4.9/531-debloat_lzma.patch @@ -14,8 +14,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> lib/lzma/LzmaEnc.c | 172 ++------------------------ 6 files changed, 42 insertions(+), 641 deletions(-) -diff --git a/include/linux/lzma/LzFind.h b/include/linux/lzma/LzFind.h -index 010c4b92ba33..6d4f8e239028 100644 --- a/include/linux/lzma/LzFind.h +++ b/include/linux/lzma/LzFind.h @@ -55,11 +55,6 @@ typedef struct _CMatchFinder @@ -30,7 +28,7 @@ index 010c4b92ba33..6d4f8e239028 100644 void MatchFinder_Construct(CMatchFinder *p); /* Conditions: -@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, UInt32 historySize, +@@ -70,12 +65,6 @@ int MatchFinder_Create(CMatchFinder *p, UInt32 keepAddBufferBefore, UInt32 matchMaxLen, UInt32 keepAddBufferAfter, ISzAlloc *alloc); void MatchFinder_Free(CMatchFinder *p, ISzAlloc *alloc); @@ -56,8 +54,6 @@ index 010c4b92ba33..6d4f8e239028 100644 #ifdef __cplusplus } #endif -diff --git a/include/linux/lzma/LzmaDec.h b/include/linux/lzma/LzmaDec.h -index bf7f084ba3dd..c90f95e9fbaf 100644 --- a/include/linux/lzma/LzmaDec.h +++ b/include/linux/lzma/LzmaDec.h @@ -31,14 +31,6 @@ typedef struct _CLzmaProps @@ -182,8 +178,6 @@ index bf7f084ba3dd..c90f95e9fbaf 100644 /* ---------- One Call Interface ---------- */ /* LzmaDecode -diff --git a/include/linux/lzma/LzmaEnc.h b/include/linux/lzma/LzmaEnc.h -index 200d60eb83cd..2986c0460be4 100644 --- a/include/linux/lzma/LzmaEnc.h +++ b/include/linux/lzma/LzmaEnc.h @@ -31,9 +31,6 @@ typedef struct _CLzmaEncProps @@ -196,7 +190,7 @@ index 200d60eb83cd..2986c0460be4 100644 /* ---------- CLzmaEncHandle Interface ---------- */ -@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc); +@@ -53,26 +50,9 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc * void LzmaEnc_Destroy(CLzmaEncHandle p, ISzAlloc *alloc, ISzAlloc *allocBig); SRes LzmaEnc_SetProps(CLzmaEncHandle p, const CLzmaEncProps *props); SRes LzmaEnc_WriteProperties(CLzmaEncHandle p, Byte *properties, SizeT *size); @@ -223,8 +217,6 @@ index 200d60eb83cd..2986c0460be4 100644 #ifdef __cplusplus } #endif -diff --git a/lib/lzma/LzFind.c b/lib/lzma/LzFind.c -index e3ecb05420eb..86251ccedfda 100644 --- a/lib/lzma/LzFind.c +++ b/lib/lzma/LzFind.c @@ -14,9 +14,15 @@ @@ -244,7 +236,7 @@ index e3ecb05420eb..86251ccedfda 100644 { alloc->Free(alloc, p->bufferBase); p->bufferBase = 0; -@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder *p, ISzAlloc *alloc) +@@ -28,7 +34,7 @@ static void LzInWindow_Free(CMatchFinder static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *alloc) { UInt32 blockSize = p->keepSizeBefore + p->keepSizeAfter + keepSizeReserv; @@ -253,7 +245,7 @@ index e3ecb05420eb..86251ccedfda 100644 { p->blockSize = blockSize; return 1; -@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinder *p, UInt32 keepSizeReserv, ISzAlloc *a +@@ -42,12 +48,12 @@ static int LzInWindow_Create(CMatchFinde return (p->bufferBase != 0); } @@ -270,7 +262,7 @@ index e3ecb05420eb..86251ccedfda 100644 { p->posLimit -= subValue; p->pos -= subValue; -@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatchFinder *p) +@@ -58,7 +64,7 @@ static void MatchFinder_ReadBlock(CMatch { if (p->streamEndWasReached || p->result != SZ_OK) return; @@ -279,7 +271,7 @@ index e3ecb05420eb..86251ccedfda 100644 { UInt32 curSize = 0xFFFFFFFF - p->streamPos; if (curSize > p->directInputRem) -@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatchFinder *p) +@@ -89,7 +95,7 @@ static void MatchFinder_ReadBlock(CMatch } } @@ -288,7 +280,7 @@ index e3ecb05420eb..86251ccedfda 100644 { memmove(p->bufferBase, p->buffer - p->keepSizeBefore, -@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder *p) +@@ -97,22 +103,14 @@ void MatchFinder_MoveBlock(CMatchFinder p->buffer = p->bufferBase + p->keepSizeBefore; } @@ -313,7 +305,7 @@ index e3ecb05420eb..86251ccedfda 100644 static void MatchFinder_CheckAndMoveAndRead(CMatchFinder *p) { if (MatchFinder_NeedMove(p)) -@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatchFinder *p) +@@ -268,7 +266,7 @@ static void MatchFinder_SetLimits(CMatch p->posLimit = p->pos + limit; } @@ -322,7 +314,7 @@ index e3ecb05420eb..86251ccedfda 100644 { UInt32 i; for (i = 0; i < p->hashSizeSum; i++) -@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CMatchFinder *p) +@@ -287,7 +285,7 @@ static UInt32 MatchFinder_GetSubValue(CM return (p->pos - p->historySize - 1) & kNormalizeMask; } @@ -331,7 +323,7 @@ index e3ecb05420eb..86251ccedfda 100644 { UInt32 i; for (i = 0; i < numItems; i++) -@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMatchFinder *p) +@@ -319,38 +317,7 @@ static void MatchFinder_CheckLimits(CMat MatchFinder_SetLimits(p); } @@ -371,7 +363,7 @@ index e3ecb05420eb..86251ccedfda 100644 UInt32 _cyclicBufferPos, UInt32 _cyclicBufferSize, UInt32 cutValue, UInt32 *distances, UInt32 maxLen) { -@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLimit, UInt32 curMatch, UInt32 pos, const +@@ -460,10 +427,10 @@ static void SkipMatchesSpec(UInt32 lenLi p->buffer++; \ if (++p->pos == p->posLimit) MatchFinder_CheckLimits(p); @@ -384,7 +376,7 @@ index e3ecb05420eb..86251ccedfda 100644 #define GET_MATCHES_HEADER2(minLen, ret_op) \ UInt32 lenLimit; UInt32 hashValue; const Byte *cur; UInt32 curMatch; \ lenLimit = p->lenLimit; { if (lenLimit < minLen) { MatchFinder_MovePos(p); ret_op; }} \ -@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFinder *p) { MOVE_POS; } +@@ -479,62 +446,7 @@ static void MatchFinder_MovePos(CMatchFi distances + offset, maxLen) - distances); MOVE_POS_RET; #define SKIP_FOOTER \ @@ -448,7 +440,7 @@ index e3ecb05420eb..86251ccedfda 100644 static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) { -@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches(CMatchFinder *p, UInt32 *distances) +@@ -583,108 +495,6 @@ static UInt32 Bt4_MatchFinder_GetMatches GET_MATCHES_FOOTER(offset, maxLen) } @@ -557,7 +549,7 @@ index e3ecb05420eb..86251ccedfda 100644 static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) { do -@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchFinder *p, UInt32 num) +@@ -701,61 +511,12 @@ static void Bt4_MatchFinder_Skip(CMatchF while (--num != 0); } @@ -621,11 +613,9 @@ index e3ecb05420eb..86251ccedfda 100644 + vTable->GetMatches = (Mf_GetMatches_Func)Bt4_MatchFinder_GetMatches; + vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; } -diff --git a/lib/lzma/LzmaDec.c b/lib/lzma/LzmaDec.c -index 2036761bf146..7666e3f82067 100644 --- a/lib/lzma/LzmaDec.c +++ b/lib/lzma/LzmaDec.c -@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, const Byte *data) +@@ -682,7 +682,7 @@ static void LzmaDec_InitRc(CLzmaDec *p, p->needFlush = 0; } @@ -634,7 +624,7 @@ index 2036761bf146..7666e3f82067 100644 { p->needFlush = 1; p->remainLen = 0; -@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p, Bool initDic, Bool initState) +@@ -698,7 +698,7 @@ void LzmaDec_InitDicAndState(CLzmaDec *p p->needInitState = 1; } @@ -643,7 +633,7 @@ index 2036761bf146..7666e3f82067 100644 { p->dicPos = 0; LzmaDec_InitDicAndState(p, True, True); -@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaDec *p) +@@ -716,7 +716,7 @@ static void LzmaDec_InitStateReal(CLzmaD p->needInitState = 0; } @@ -652,7 +642,7 @@ index 2036761bf146..7666e3f82067 100644 ELzmaFinishMode finishMode, ELzmaStatus *status) { SizeT inSize = *srcLen; -@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, SizeT dicLimit, const Byte *src, SizeT *sr +@@ -837,65 +837,13 @@ SRes LzmaDec_DecodeToDic(CLzmaDec *p, Si return (p->code == 0) ? SZ_OK : SZ_ERROR_DATA; } @@ -720,26 +710,26 @@ index 2036761bf146..7666e3f82067 100644 { UInt32 dicSize; Byte d; -@@ -935,33 +883,11 @@ static SRes LzmaDec_AllocateProbs2(CLzmaDec *p, const CLzmaProps *propNew, ISzAl +@@ -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) - { @@ -752,11 +742,12 @@ index 2036761bf146..7666e3f82067 100644 - } - } - p->dicBufSize = dicBufSize; - p->prop = propNew; - return SZ_OK; - } -diff --git a/lib/lzma/LzmaEnc.c b/lib/lzma/LzmaEnc.c -index 6dadf00dfab2..943965647bad 100644 +- 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/lib/lzma/LzmaEnc.c +++ b/lib/lzma/LzmaEnc.c @@ -53,7 +53,7 @@ void LzmaEncProps_Init(CLzmaEncProps *p) @@ -768,7 +759,7 @@ index 6dadf00dfab2..943965647bad 100644 { int level = p->level; if (level < 0) level = 5; -@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProps *p) +@@ -76,7 +76,7 @@ void LzmaEncProps_Normalize(CLzmaEncProp #endif } @@ -777,7 +768,7 @@ index 6dadf00dfab2..943965647bad 100644 { CLzmaEncProps props = *props2; LzmaEncProps_Normalize(&props); -@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CLzmaEncProps *props2) +@@ -93,7 +93,7 @@ UInt32 LzmaEncProps_GetDictSize(const CL #define BSR2_RET(pos, res) { unsigned long i; _BitScanReverse(&i, (pos)); res = (i + i) + ((pos >> (i - 1)) & 1); } @@ -854,7 +845,7 @@ index 6dadf00dfab2..943965647bad 100644 SRes LzmaEnc_SetProps(CLzmaEncHandle pp, const CLzmaEncProps *props2) { CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeEnc *p, CLzmaProb *probs, UInt32 symbol, +@@ -600,7 +548,7 @@ static void LitEnc_EncodeMatched(CRangeE while (symbol < 0x10000); } @@ -863,7 +854,7 @@ index 6dadf00dfab2..943965647bad 100644 { UInt32 i; for (i = (1 << kNumMoveReducingBits) / 2; i < kBitModelTotal; i += (1 << kNumMoveReducingBits)) -@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc *p) +@@ -1676,7 +1624,7 @@ static void FillDistancesPrices(CLzmaEnc p->matchPriceCount = 0; } @@ -872,7 +863,7 @@ index 6dadf00dfab2..943965647bad 100644 { RangeEnc_Construct(&p->rc); MatchFinder_Construct(&p->matchFinderBase); -@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc *alloc) +@@ -1709,7 +1657,7 @@ CLzmaEncHandle LzmaEnc_Create(ISzAlloc * return p; } @@ -881,7 +872,7 @@ index 6dadf00dfab2..943965647bad 100644 { alloc->Free(alloc, p->litProbs); alloc->Free(alloc, p->saveState.litProbs); -@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAlloc *alloc) +@@ -1717,7 +1665,7 @@ void LzmaEnc_FreeLits(CLzmaEnc *p, ISzAl p->saveState.litProbs = 0; } @@ -890,7 +881,7 @@ index 6dadf00dfab2..943965647bad 100644 { #ifndef _7ZIP_ST MatchFinderMt_Destruct(&p->matchFinderMt, allocBig); -@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *alloc, I +@@ -1947,7 +1895,7 @@ static SRes LzmaEnc_Alloc(CLzmaEnc *p, U return SZ_OK; } @@ -908,7 +899,7 @@ index 6dadf00dfab2..943965647bad 100644 { if (!p->fastMode) { -@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEnc *p, UInt32 keepWindowSize, ISzAlloc *a +@@ -2037,26 +1985,6 @@ static SRes LzmaEnc_AllocAndInit(CLzmaEn return SZ_OK; } @@ -935,7 +926,7 @@ index 6dadf00dfab2..943965647bad 100644 static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) { p->matchFinderBase.directInput = 1; -@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc *p, const Byte *src, SizeT srcLen) +@@ -2064,7 +1992,7 @@ static void LzmaEnc_SetInputBuf(CLzmaEnc p->matchFinderBase.directInputRem = srcLen; } @@ -944,7 +935,7 @@ index 6dadf00dfab2..943965647bad 100644 UInt32 keepWindowSize, ISzAlloc *alloc, ISzAlloc *allocBig) { CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle pp, const Byte *src, SizeT srcLen, +@@ -2074,7 +2002,7 @@ SRes LzmaEnc_MemPrepare(CLzmaEncHandle p return LzmaEnc_AllocAndInit(p, keepWindowSize, alloc, allocBig); } @@ -953,7 +944,7 @@ index 6dadf00dfab2..943965647bad 100644 { #ifndef _7ZIP_ST CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const void *data, size_t size) +@@ -2107,53 +2035,6 @@ static size_t MyWrite(void *pp, const vo return size; } @@ -1007,7 +998,7 @@ index 6dadf00dfab2..943965647bad 100644 static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress) { SRes res = SZ_OK; -@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p, ICompressProgress *progress) +@@ -2184,13 +2065,6 @@ static SRes LzmaEnc_Encode2(CLzmaEnc *p, return res; } @@ -1021,7 +1012,7 @@ index 6dadf00dfab2..943965647bad 100644 SRes LzmaEnc_WriteProperties(CLzmaEncHandle pp, Byte *props, SizeT *size) { CLzmaEnc *p = (CLzmaEnc *)pp; -@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp, Byte *dest, SizeT *destLen, const Byte +@@ -2247,25 +2121,3 @@ SRes LzmaEnc_MemEncode(CLzmaEncHandle pp return SZ_ERROR_OUTPUT_EOF; return res; } @@ -1047,6 +1038,3 @@ index 6dadf00dfab2..943965647bad 100644 - LzmaEnc_Destroy(p, alloc, allocBig); - return res; -} --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch index 758b465def..ba87420b32 100644 --- a/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch +++ b/target/linux/generic/hack-4.9/640-bridge-only-accept-EAP-locally.patch @@ -11,11 +11,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/bridge/br_input.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) -diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c -index 267b46af407f..48fa08f32c2a 100644 --- a/net/bridge/br_input.c +++ b/net/bridge/br_input.c -@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *net, struct sock *sk, struct sk_buff *skb +@@ -164,11 +164,14 @@ int br_handle_frame_finish(struct net *n } } @@ -32,6 +30,3 @@ index 267b46af407f..48fa08f32c2a 100644 if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid, p); --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch index 637550fa28..56259329d2 100644 --- a/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch +++ b/target/linux/generic/hack-4.9/641-bridge_port_isolate.patch @@ -13,10 +13,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/bridge/br_sysfs_if.c | 2 ++ 4 files changed, 11 insertions(+) -Index: linux-4.9.34/include/linux/if_bridge.h -=================================================================== ---- linux-4.9.34.orig/include/linux/if_bridge.h -+++ linux-4.9.34/include/linux/if_bridge.h +--- a/include/linux/if_bridge.h ++++ b/include/linux/if_bridge.h @@ -47,6 +47,7 @@ struct br_ip_list { #define BR_PROXYARP_WIFI BIT(10) #define BR_MCAST_FLOOD BIT(11) @@ -25,10 +23,8 @@ Index: linux-4.9.34/include/linux/if_bridge.h #define BR_DEFAULT_AGEING_TIME (300 * HZ) -Index: linux-4.9.34/net/bridge/br_forward.c -=================================================================== ---- linux-4.9.34.orig/net/bridge/br_forward.c -+++ linux-4.9.34/net/bridge/br_forward.c +--- a/net/bridge/br_forward.c ++++ b/net/bridge/br_forward.c @@ -141,6 +141,9 @@ static int deliver_clone(const struct ne void br_forward(const struct net_bridge_port *to, struct sk_buff *skb, bool local_rcv, bool local_orig) @@ -48,10 +44,8 @@ Index: linux-4.9.34/net/bridge/br_forward.c /* Do not flood unicast traffic to ports that turn it off */ if (pkt_type == BR_PKT_UNICAST && !(p->flags & BR_FLOOD)) continue; -Index: linux-4.9.34/net/bridge/br_input.c -=================================================================== ---- linux-4.9.34.orig/net/bridge/br_input.c -+++ linux-4.9.34/net/bridge/br_input.c +--- a/net/bridge/br_input.c ++++ b/net/bridge/br_input.c @@ -175,6 +175,9 @@ int br_handle_frame_finish(struct net *n if (IS_ENABLED(CONFIG_INET) && skb->protocol == htons(ETH_P_ARP)) br_do_proxy_arp(skb, br, vid, p); @@ -62,10 +56,8 @@ Index: linux-4.9.34/net/bridge/br_input.c switch (pkt_type) { case BR_PKT_MULTICAST: mdst = br_mdb_get(br, skb, vid); -Index: linux-4.9.34/net/bridge/br_sysfs_if.c -=================================================================== ---- linux-4.9.34.orig/net/bridge/br_sysfs_if.c -+++ linux-4.9.34/net/bridge/br_sysfs_if.c +--- a/net/bridge/br_sysfs_if.c ++++ b/net/bridge/br_sysfs_if.c @@ -172,6 +172,7 @@ BRPORT_ATTR_FLAG(unicast_flood, BR_FLOOD BRPORT_ATTR_FLAG(proxyarp, BR_PROXYARP); BRPORT_ATTR_FLAG(proxyarp_wifi, BR_PROXYARP_WIFI); diff --git a/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch b/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch index 67aa5e7ec7..a4699ae8ed 100644 --- a/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch +++ b/target/linux/generic/hack-4.9/651-wireless_mesh_header.patch @@ -9,11 +9,9 @@ Signed-off-by: Imre Kaloz <kaloz@openwrt.org> include/linux/netdevice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h -index 780e7171f548..6e0f2c79f79a 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h -@@ -137,8 +137,8 @@ static inline bool dev_xmit_complete(int rc) +@@ -137,8 +137,8 @@ static inline bool dev_xmit_complete(int #if defined(CONFIG_HYPERV_NET) # define LL_MAX_HEADER 128 @@ -24,6 +22,3 @@ index 780e7171f548..6e0f2c79f79a 100644 # define LL_MAX_HEADER 128 # else # define LL_MAX_HEADER 96 --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch index 3bac10f6eb..c91ea01b50 100644 --- a/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch +++ b/target/linux/generic/hack-4.9/660-fq_codel_defaults.patch @@ -8,11 +8,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/sched/sch_fq_codel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index a5ea0e9b6be4..4467b95795bf 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -479,7 +479,7 @@ static int fq_codel_init(struct Qdisc *sch, struct nlattr *opt) +@@ -479,7 +479,7 @@ static int fq_codel_init(struct Qdisc *s sch->limit = 10*1024; q->flows_cnt = 1024; @@ -21,6 +19,3 @@ index a5ea0e9b6be4..4467b95795bf 100644 q->drop_batch_size = 64; q->quantum = psched_mtu(qdisc_dev(sch)); q->perturbation = prandom_u32(); --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch index 2d34cded01..77e11f7230 100644 --- a/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch +++ b/target/linux/generic/hack-4.9/661-use_fq_codel_by_default.patch @@ -12,8 +12,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/sched/sch_generic.c | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) -diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h -index e6aa0a249672..9eeb368d7eea 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h @@ -339,12 +339,13 @@ extern struct Qdisc_ops noop_qdisc_ops; @@ -31,8 +29,6 @@ index e6aa0a249672..9eeb368d7eea 100644 } struct Qdisc_class_common { -diff --git a/net/sched/Kconfig b/net/sched/Kconfig -index 87956a768d1b..89c6db93cb63 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig @@ -3,8 +3,9 @@ @@ -46,11 +42,9 @@ index 87956a768d1b..89c6db93cb63 100644 ---help--- When the kernel has several packets to send out over a network device, it has to decide which ones to send first, which ones to -diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c -index 206dc24add3a..9b5cfb6ac64b 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c -@@ -1976,7 +1976,7 @@ static int __init pktsched_init(void) +@@ -1979,7 +1979,7 @@ static int __init pktsched_init(void) return err; } @@ -59,11 +53,9 @@ index 206dc24add3a..9b5cfb6ac64b 100644 register_qdisc(&pfifo_qdisc_ops); register_qdisc(&bfifo_qdisc_ops); register_qdisc(&pfifo_head_drop_qdisc_ops); -diff --git a/net/sched/sch_fq_codel.c b/net/sched/sch_fq_codel.c -index 4467b95795bf..2ebbf50658e5 100644 --- a/net/sched/sch_fq_codel.c +++ b/net/sched/sch_fq_codel.c -@@ -705,7 +705,7 @@ static const struct Qdisc_class_ops fq_codel_class_ops = { +@@ -705,7 +705,7 @@ static const struct Qdisc_class_ops fq_c .walk = fq_codel_walk, }; @@ -72,7 +64,7 @@ index 4467b95795bf..2ebbf50658e5 100644 .cl_ops = &fq_codel_class_ops, .id = "fq_codel", .priv_size = sizeof(struct fq_codel_sched_data), -@@ -720,6 +720,7 @@ static struct Qdisc_ops fq_codel_qdisc_ops __read_mostly = { +@@ -720,6 +720,7 @@ static struct Qdisc_ops fq_codel_qdisc_o .dump_stats = fq_codel_dump_stats, .owner = THIS_MODULE, }; @@ -80,8 +72,6 @@ index 4467b95795bf..2ebbf50658e5 100644 static int __init fq_codel_module_init(void) { -diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c -index 6cfb6e9038c2..97de97e3c5e2 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@ -31,7 +31,7 @@ @@ -93,7 +83,7 @@ index 6cfb6e9038c2..97de97e3c5e2 100644 EXPORT_SYMBOL(default_qdisc_ops); /* Main transmission queue. */ -@@ -759,7 +759,7 @@ static void attach_one_default_qdisc(struct net_device *dev, +@@ -759,7 +759,7 @@ static void attach_one_default_qdisc(str void *_unused) { struct Qdisc *qdisc; @@ -102,6 +92,3 @@ index 6cfb6e9038c2..97de97e3c5e2 100644 if (dev->priv_flags & IFF_NO_QUEUE) ops = &noqueue_qdisc_ops; --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch b/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch index aaa0d76843..d9fba6288d 100644 --- a/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch +++ b/target/linux/generic/hack-4.9/662-remove_pfifo_fast.patch @@ -8,11 +8,9 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/sched/sch_generic.c | 140 ------------------------------------------------ 1 file changed, 140 deletions(-) -diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c -index 97de97e3c5e2..a62de9e4e897 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c -@@ -449,146 +449,6 @@ struct Qdisc_ops noqueue_qdisc_ops __read_mostly = { +@@ -449,146 +449,6 @@ struct Qdisc_ops noqueue_qdisc_ops __rea .owner = THIS_MODULE, }; @@ -159,6 +157,3 @@ index 97de97e3c5e2..a62de9e4e897 100644 static struct lock_class_key qdisc_tx_busylock; static struct lock_class_key qdisc_running_key; --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch index 47715dcc28..760ba4fc80 100644 --- a/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch +++ b/target/linux/generic/hack-4.9/700-swconfig_switch_drivers.patch @@ -10,8 +10,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> include/uapi/linux/Kbuild | 1 + 3 files changed, 99 insertions(+) -diff --git a/drivers/net/phy/Kconfig b/drivers/net/phy/Kconfig -index 2651c8d8de2f..a920adb78fea 100644 --- a/drivers/net/phy/Kconfig +++ b/drivers/net/phy/Kconfig @@ -147,6 +147,89 @@ config MDIO_XGENE @@ -104,8 +102,6 @@ index 2651c8d8de2f..a920adb78fea 100644 comment "MII PHY device drivers" config AMD_PHY -diff --git a/drivers/net/phy/Makefile b/drivers/net/phy/Makefile -index e58667d111e7..542b6be8953a 100644 --- a/drivers/net/phy/Makefile +++ b/drivers/net/phy/Makefile @@ -5,6 +5,21 @@ libphy-$(CONFIG_SWPHY) += swphy.o @@ -130,8 +126,6 @@ index e58667d111e7..542b6be8953a 100644 obj-$(CONFIG_MDIO_BCM_IPROC) += mdio-bcm-iproc.o obj-$(CONFIG_MDIO_BCM_UNIMAC) += mdio-bcm-unimac.o obj-$(CONFIG_MDIO_BITBANG) += mdio-bitbang.o -diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild -index cd2be1c8e9fb..ccdd8d586ab8 100644 --- a/include/uapi/linux/Kbuild +++ b/include/uapi/linux/Kbuild @@ -399,6 +399,7 @@ header-y += stddef.h @@ -142,6 +136,3 @@ index cd2be1c8e9fb..ccdd8d586ab8 100644 header-y += synclink.h header-y += sync_file.h header-y += sysctl.h --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch b/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch index 5c0c22e253..cf798bc200 100644 --- a/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch +++ b/target/linux/generic/hack-4.9/702-phy_add_aneg_done_function.patch @@ -15,7 +15,7 @@ --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c -@@ -1309,6 +1309,9 @@ int genphy_update_link(struct phy_device +@@ -1312,6 +1312,9 @@ int genphy_update_link(struct phy_device { int status; diff --git a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch index 55607bc6ea..838c73789c 100644 --- a/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch +++ b/target/linux/generic/hack-4.9/710-phy-add-mdio_register_board_info.patch @@ -50,7 +50,7 @@ phy_device_free(phydev); --- a/include/linux/phy.h +++ b/include/linux/phy.h -@@ -859,6 +859,23 @@ void mdio_bus_exit(void); +@@ -863,6 +863,23 @@ void mdio_bus_exit(void); extern struct bus_type mdio_bus_type; diff --git a/target/linux/generic/hack-4.9/721-phy_packets.patch b/target/linux/generic/hack-4.9/721-phy_packets.patch index 3cb44235c9..8b607ac89b 100644 --- a/target/linux/generic/hack-4.9/721-phy_packets.patch +++ b/target/linux/generic/hack-4.9/721-phy_packets.patch @@ -13,10 +13,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/ethernet/eth.c | 6 ++++++ 6 files changed, 58 insertions(+), 14 deletions(-) -Index: linux-4.9.34/include/linux/netdevice.h -=================================================================== ---- linux-4.9.34.orig/include/linux/netdevice.h -+++ linux-4.9.34/include/linux/netdevice.h +--- a/include/linux/netdevice.h ++++ b/include/linux/netdevice.h @@ -1398,6 +1398,7 @@ enum netdev_priv_flags { IFF_RXFH_CONFIGURED = 1<<25, IFF_PHONY_HEADROOM = 1<<26, @@ -56,10 +54,8 @@ Index: linux-4.9.34/include/linux/netdevice.h /* * Cache lines mostly used on receive path (including eth_type_trans()) */ -Index: linux-4.9.34/include/linux/skbuff.h -=================================================================== ---- linux-4.9.34.orig/include/linux/skbuff.h -+++ linux-4.9.34/include/linux/skbuff.h +--- a/include/linux/skbuff.h ++++ b/include/linux/skbuff.h @@ -2334,6 +2334,10 @@ static inline int pskb_trim(struct sk_bu return (len < skb->len) ? __pskb_trim(skb, len) : 0; } @@ -88,10 +84,8 @@ Index: linux-4.9.34/include/linux/skbuff.h static inline struct sk_buff *netdev_alloc_skb_ip_align(struct net_device *dev, unsigned int length) { -Index: linux-4.9.34/net/Kconfig -=================================================================== ---- linux-4.9.34.orig/net/Kconfig -+++ linux-4.9.34/net/Kconfig +--- a/net/Kconfig ++++ b/net/Kconfig @@ -25,6 +25,12 @@ menuconfig NET if NET @@ -105,11 +99,9 @@ Index: linux-4.9.34/net/Kconfig config WANT_COMPAT_NETLINK_MESSAGES bool help -Index: linux-4.9.34/net/core/dev.c -=================================================================== ---- linux-4.9.34.orig/net/core/dev.c -+++ linux-4.9.34/net/core/dev.c -@@ -2931,10 +2931,20 @@ static int xmit_one(struct sk_buff *skb, +--- a/net/core/dev.c ++++ b/net/core/dev.c +@@ -2939,10 +2939,20 @@ static int xmit_one(struct sk_buff *skb, if (!list_empty(&ptype_all) || !list_empty(&dev->ptype_all)) dev_queue_xmit_nit(skb, dev); @@ -134,10 +126,8 @@ Index: linux-4.9.34/net/core/dev.c return rc; } -Index: linux-4.9.34/net/core/skbuff.c -=================================================================== ---- linux-4.9.34.orig/net/core/skbuff.c -+++ linux-4.9.34/net/core/skbuff.c +--- a/net/core/skbuff.c ++++ b/net/core/skbuff.c @@ -64,6 +64,7 @@ #include <linux/errqueue.h> #include <linux/prefetch.h> @@ -169,10 +159,8 @@ Index: linux-4.9.34/net/core/skbuff.c void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, int size, unsigned int truesize) { -Index: linux-4.9.34/net/ethernet/eth.c -=================================================================== ---- linux-4.9.34.orig/net/ethernet/eth.c -+++ linux-4.9.34/net/ethernet/eth.c +--- a/net/ethernet/eth.c ++++ b/net/ethernet/eth.c @@ -171,6 +171,12 @@ __be16 eth_type_trans(struct sk_buff *sk const struct ethhdr *eth; diff --git a/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch b/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch index 8e353a2f6d..c865177c2a 100644 --- a/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch +++ b/target/linux/generic/hack-4.9/773-bgmac-add-srab-switch.patch @@ -12,10 +12,8 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> drivers/net/ethernet/broadcom/bgmac.h | 4 ++++ 3 files changed, 29 insertions(+) -Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac-bcma.c -=================================================================== ---- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac-bcma.c -+++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac-bcma.c +--- a/drivers/net/ethernet/broadcom/bgmac-bcma.c ++++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c @@ -230,6 +230,7 @@ static int bgmac_probe(struct bcma_devic bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; bgmac->feature_flags |= BGMAC_FEAT_NO_RESET; @@ -24,10 +22,8 @@ Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac-bcma.c break; case BCMA_CHIP_ID_BCM53573: bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; -Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.c -=================================================================== ---- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac.c -+++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.c +--- a/drivers/net/ethernet/broadcom/bgmac.c ++++ b/drivers/net/ethernet/broadcom/bgmac.c @@ -11,6 +11,7 @@ #include <linux/bcma/bcma.h> @@ -80,10 +76,8 @@ Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.c unregister_netdev(bgmac->net_dev); phy_disconnect(bgmac->net_dev->phydev); netif_napi_del(&bgmac->napi); -Index: linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.h -=================================================================== ---- linux-4.9.34.orig/drivers/net/ethernet/broadcom/bgmac.h -+++ linux-4.9.34/drivers/net/ethernet/broadcom/bgmac.h +--- a/drivers/net/ethernet/broadcom/bgmac.h ++++ b/drivers/net/ethernet/broadcom/bgmac.h @@ -409,6 +409,7 @@ #define BGMAC_FEAT_CC4_IF_SW_TYPE BIT(17) #define BGMAC_FEAT_CC4_IF_SW_TYPE_RGMII BIT(18) diff --git a/target/linux/generic/hack-4.9/835-misc-owl_loader.patch b/target/linux/generic/hack-4.9/835-misc-owl_loader.patch index 1c7a28a735..07cd4e580a 100644 --- a/target/linux/generic/hack-4.9/835-misc-owl_loader.patch +++ b/target/linux/generic/hack-4.9/835-misc-owl_loader.patch @@ -19,8 +19,6 @@ Signed-off-by: Christian Lamparter <chunkeey@googlemail.com> drivers/misc/Makefile | 1 + 2 files changed, 13 insertions(+) -diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 64971baf11fa..50d2eaa75d41 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -151,6 +151,18 @@ config SGI_IOC4 @@ -42,11 +40,9 @@ index 64971baf11fa..50d2eaa75d41 100644 config TIFM_CORE tristate "TI Flash Media interface support" depends on PCI -diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile -index 31983366090a..48c7e74a6e5a 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib.o +@@ -12,6 +12,7 @@ obj-$(CONFIG_ATMEL_TCLIB) += atmel_tclib obj-$(CONFIG_DUMMY_IRQ) += dummy-irq.o obj-$(CONFIG_ICS932S401) += ics932s401.o obj-$(CONFIG_LKDTM) += lkdtm.o @@ -54,6 +50,3 @@ index 31983366090a..48c7e74a6e5a 100644 obj-$(CONFIG_TIFM_CORE) += tifm_core.o obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o obj-$(CONFIG_PHANTOM) += phantom.o --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch index d46e2ca1e7..98ac5afea6 100644 --- a/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch +++ b/target/linux/generic/hack-4.9/901-debloat_sock_diag.patch @@ -14,8 +14,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/unix/Kconfig | 1 + 7 files changed, 11 insertions(+), 1 deletion(-) -diff --git a/net/Kconfig b/net/Kconfig -index 38a0c857eb52..b4621e1f3470 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -95,6 +95,9 @@ source "net/netlabel/Kconfig" @@ -28,11 +26,9 @@ index 38a0c857eb52..b4621e1f3470 100644 config NETWORK_SECMARK bool "Security Marking" help -diff --git a/net/core/Makefile b/net/core/Makefile -index d6508c2ddca5..bee4adde14d8 100644 --- a/net/core/Makefile +++ b/net/core/Makefile -@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core.o +@@ -9,8 +9,9 @@ obj-$(CONFIG_SYSCTL) += sysctl_net_core. obj-y += dev.o ethtool.o dev_addr_lists.o dst.o netevent.o \ neighbour.o rtnetlink.o utils.o link_watch.o filter.o \ @@ -43,8 +39,6 @@ index d6508c2ddca5..bee4adde14d8 100644 obj-$(CONFIG_XFRM) += flow.o obj-y += net-sysfs.o obj-$(CONFIG_PROC_FS) += net-procfs.o -diff --git a/net/core/sock.c b/net/core/sock.c -index 1989b3dd6d17..d4ca8db4166a 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1457,9 +1457,11 @@ void sk_destruct(struct sock *sk) @@ -59,8 +53,6 @@ index 1989b3dd6d17..d4ca8db4166a 100644 sk_destruct(sk); } -diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig -index b54b3ca939db..74ecf598622c 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig @@ -408,6 +408,7 @@ config INET_XFRM_MODE_BEET @@ -71,8 +63,6 @@ index b54b3ca939db..74ecf598622c 100644 default y ---help--- Support for INET (TCP, DCCP, etc) socket monitoring interface used by -diff --git a/net/netlink/Kconfig b/net/netlink/Kconfig -index 5d6e8c05b3d4..8a2696d66c20 100644 --- a/net/netlink/Kconfig +++ b/net/netlink/Kconfig @@ -4,6 +4,7 @@ @@ -83,8 +73,6 @@ index 5d6e8c05b3d4..8a2696d66c20 100644 default n ---help--- Support for NETLINK socket monitoring interface used by the ss tool. -diff --git a/net/packet/Kconfig b/net/packet/Kconfig -index cc55b35f80e5..9a83c86f5480 100644 --- a/net/packet/Kconfig +++ b/net/packet/Kconfig @@ -18,6 +18,7 @@ config PACKET @@ -95,8 +83,6 @@ index cc55b35f80e5..9a83c86f5480 100644 default n ---help--- Support for PF_PACKET sockets monitoring interface used by the ss tool. -diff --git a/net/unix/Kconfig b/net/unix/Kconfig -index 8b31ab85d050..6548cf3ea7f1 100644 --- a/net/unix/Kconfig +++ b/net/unix/Kconfig @@ -22,6 +22,7 @@ config UNIX @@ -107,6 +93,3 @@ index 8b31ab85d050..6548cf3ea7f1 100644 default n ---help--- Support for UNIX socket monitoring interface used by the ss tool. --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/902-debloat_proc.patch b/target/linux/generic/hack-4.9/902-debloat_proc.patch index 5a2eb2bcf0..39cb2693d7 100644 --- a/target/linux/generic/hack-4.9/902-debloat_proc.patch +++ b/target/linux/generic/hack-4.9/902-debloat_proc.patch @@ -27,10 +27,8 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> net/ipv4/route.c | 3 +++ 20 files changed, 105 insertions(+), 17 deletions(-) -Index: linux-4.9.34/fs/locks.c -=================================================================== ---- linux-4.9.34.orig/fs/locks.c -+++ linux-4.9.34/fs/locks.c +--- a/fs/locks.c ++++ b/fs/locks.c @@ -2802,6 +2802,8 @@ static const struct file_operations proc static int __init proc_locks_init(void) @@ -40,10 +38,8 @@ Index: linux-4.9.34/fs/locks.c proc_create("locks", 0, NULL, &proc_locks_operations); return 0; } -Index: linux-4.9.34/fs/proc/Kconfig -=================================================================== ---- linux-4.9.34.orig/fs/proc/Kconfig -+++ linux-4.9.34/fs/proc/Kconfig +--- a/fs/proc/Kconfig ++++ b/fs/proc/Kconfig @@ -81,3 +81,8 @@ config PROC_CHILDREN Say Y if you are running any user-space software which takes benefit from @@ -53,10 +49,8 @@ Index: linux-4.9.34/fs/proc/Kconfig + default n + depends on EXPERT + bool "Strip non-essential /proc functionality to reduce code size" -Index: linux-4.9.34/fs/proc/consoles.c -=================================================================== ---- linux-4.9.34.orig/fs/proc/consoles.c -+++ linux-4.9.34/fs/proc/consoles.c +--- a/fs/proc/consoles.c ++++ b/fs/proc/consoles.c @@ -106,6 +106,9 @@ static const struct file_operations proc static int __init proc_consoles_init(void) @@ -67,10 +61,8 @@ Index: linux-4.9.34/fs/proc/consoles.c proc_create("consoles", 0, NULL, &proc_consoles_operations); return 0; } -Index: linux-4.9.34/fs/proc/proc_tty.c -=================================================================== ---- linux-4.9.34.orig/fs/proc/proc_tty.c -+++ linux-4.9.34/fs/proc/proc_tty.c +--- a/fs/proc/proc_tty.c ++++ b/fs/proc/proc_tty.c @@ -143,7 +143,10 @@ static const struct file_operations proc void proc_tty_register_driver(struct tty_driver *driver) { @@ -103,10 +95,8 @@ Index: linux-4.9.34/fs/proc/proc_tty.c if (!proc_mkdir("tty", NULL)) return; proc_mkdir("tty/ldisc", NULL); /* Preserved: it's userspace visible */ -Index: linux-4.9.34/include/net/snmp.h -=================================================================== ---- linux-4.9.34.orig/include/net/snmp.h -+++ linux-4.9.34/include/net/snmp.h +--- a/include/net/snmp.h ++++ b/include/net/snmp.h @@ -123,6 +123,21 @@ struct linux_xfrm_mib { #define DECLARE_SNMP_STAT(type, name) \ extern __typeof__(type) __percpu *name @@ -140,10 +130,8 @@ Index: linux-4.9.34/include/net/snmp.h #define __SNMP_ADD_STATS64(mib, field, addend) \ do { \ -Index: linux-4.9.34/ipc/msg.c -=================================================================== ---- linux-4.9.34.orig/ipc/msg.c -+++ linux-4.9.34/ipc/msg.c +--- a/ipc/msg.c ++++ b/ipc/msg.c @@ -1058,6 +1058,9 @@ void __init msg_init(void) { msg_init_ns(&init_ipc_ns); @@ -154,10 +142,8 @@ Index: linux-4.9.34/ipc/msg.c ipc_init_proc_interface("sysvipc/msg", " key msqid perms cbytes qnum lspid lrpid uid gid cuid cgid stime rtime ctime\n", IPC_MSG_IDS, sysvipc_msg_proc_show); -Index: linux-4.9.34/ipc/sem.c -=================================================================== ---- linux-4.9.34.orig/ipc/sem.c -+++ linux-4.9.34/ipc/sem.c +--- a/ipc/sem.c ++++ b/ipc/sem.c @@ -205,6 +205,8 @@ void sem_exit_ns(struct ipc_namespace *n void __init sem_init(void) { @@ -167,10 +153,8 @@ Index: linux-4.9.34/ipc/sem.c ipc_init_proc_interface("sysvipc/sem", " key semid perms nsems uid gid cuid cgid otime ctime\n", IPC_SEM_IDS, sysvipc_sem_proc_show); -Index: linux-4.9.34/ipc/shm.c -=================================================================== ---- linux-4.9.34.orig/ipc/shm.c -+++ linux-4.9.34/ipc/shm.c +--- a/ipc/shm.c ++++ b/ipc/shm.c @@ -118,6 +118,8 @@ pure_initcall(ipc_ns_init); void __init shm_init(void) @@ -180,10 +164,8 @@ Index: linux-4.9.34/ipc/shm.c ipc_init_proc_interface("sysvipc/shm", #if BITS_PER_LONG <= 32 " key shmid perms size cpid lpid nattch uid gid cuid cgid atime dtime ctime rss swap\n", -Index: linux-4.9.34/ipc/util.c -=================================================================== ---- linux-4.9.34.orig/ipc/util.c -+++ linux-4.9.34/ipc/util.c +--- a/ipc/util.c ++++ b/ipc/util.c @@ -121,6 +121,9 @@ void __init ipc_init_proc_interface(cons struct proc_dir_entry *pde; struct ipc_proc_iface *iface; @@ -194,10 +176,8 @@ Index: linux-4.9.34/ipc/util.c iface = kmalloc(sizeof(*iface), GFP_KERNEL); if (!iface) return; -Index: linux-4.9.34/kernel/exec_domain.c -=================================================================== ---- linux-4.9.34.orig/kernel/exec_domain.c -+++ linux-4.9.34/kernel/exec_domain.c +--- a/kernel/exec_domain.c ++++ b/kernel/exec_domain.c @@ -41,6 +41,8 @@ static const struct file_operations exec static int __init proc_execdomains_init(void) @@ -207,10 +187,8 @@ Index: linux-4.9.34/kernel/exec_domain.c proc_create("execdomains", 0, NULL, &execdomains_proc_fops); return 0; } -Index: linux-4.9.34/kernel/irq/proc.c -=================================================================== ---- linux-4.9.34.orig/kernel/irq/proc.c -+++ linux-4.9.34/kernel/irq/proc.c +--- a/kernel/irq/proc.c ++++ b/kernel/irq/proc.c @@ -326,6 +326,9 @@ void register_irq_proc(unsigned int irq, static DEFINE_MUTEX(register_lock); char name [MAX_NAMELEN]; @@ -241,10 +219,8 @@ Index: linux-4.9.34/kernel/irq/proc.c /* create /proc/irq */ root_irq_dir = proc_mkdir("irq", NULL); if (!root_irq_dir) -Index: linux-4.9.34/kernel/time/timer_list.c -=================================================================== ---- linux-4.9.34.orig/kernel/time/timer_list.c -+++ linux-4.9.34/kernel/time/timer_list.c +--- a/kernel/time/timer_list.c ++++ b/kernel/time/timer_list.c @@ -393,6 +393,8 @@ static int __init init_timer_list_procfs { struct proc_dir_entry *pe; @@ -254,11 +230,9 @@ Index: linux-4.9.34/kernel/time/timer_list.c pe = proc_create("timer_list", 0444, NULL, &timer_list_fops); if (!pe) return -ENOMEM; -Index: linux-4.9.34/mm/vmalloc.c -=================================================================== ---- linux-4.9.34.orig/mm/vmalloc.c -+++ linux-4.9.34/mm/vmalloc.c -@@ -2703,6 +2703,8 @@ static const struct file_operations proc +--- a/mm/vmalloc.c ++++ b/mm/vmalloc.c +@@ -2713,6 +2713,8 @@ static const struct file_operations proc static int __init proc_vmalloc_init(void) { @@ -267,10 +241,8 @@ Index: linux-4.9.34/mm/vmalloc.c proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations); return 0; } -Index: linux-4.9.34/mm/vmstat.c -=================================================================== ---- linux-4.9.34.orig/mm/vmstat.c -+++ linux-4.9.34/mm/vmstat.c +--- a/mm/vmstat.c ++++ b/mm/vmstat.c @@ -1791,10 +1791,12 @@ static int __init setup_vmstat(void) cpu_notifier_register_done(); #endif @@ -287,10 +259,8 @@ Index: linux-4.9.34/mm/vmstat.c #endif return 0; } -Index: linux-4.9.34/net/8021q/vlanproc.c -=================================================================== ---- linux-4.9.34.orig/net/8021q/vlanproc.c -+++ linux-4.9.34/net/8021q/vlanproc.c +--- a/net/8021q/vlanproc.c ++++ b/net/8021q/vlanproc.c @@ -127,6 +127,9 @@ void vlan_proc_cleanup(struct net *net) { struct vlan_net *vn = net_generic(net, vlan_net_id); @@ -311,10 +281,8 @@ Index: linux-4.9.34/net/8021q/vlanproc.c vn->proc_vlan_dir = proc_net_mkdir(net, name_root, net->proc_net); if (!vn->proc_vlan_dir) goto err; -Index: linux-4.9.34/net/core/net-procfs.c -=================================================================== ---- linux-4.9.34.orig/net/core/net-procfs.c -+++ linux-4.9.34/net/core/net-procfs.c +--- a/net/core/net-procfs.c ++++ b/net/core/net-procfs.c @@ -319,10 +319,12 @@ static int __net_init dev_proc_net_init( if (!proc_create("dev", S_IRUGO, net->proc_net, &dev_seq_fops)) @@ -357,10 +325,8 @@ Index: linux-4.9.34/net/core/net-procfs.c remove_proc_entry("dev", net->proc_net); } -Index: linux-4.9.34/net/core/sock.c -=================================================================== ---- linux-4.9.34.orig/net/core/sock.c -+++ linux-4.9.34/net/core/sock.c +--- a/net/core/sock.c ++++ b/net/core/sock.c @@ -3082,6 +3082,8 @@ static __net_initdata struct pernet_oper static int __init proto_init(void) @@ -370,10 +336,8 @@ Index: linux-4.9.34/net/core/sock.c return register_pernet_subsys(&proto_net_ops); } -Index: linux-4.9.34/net/ipv4/fib_trie.c -=================================================================== ---- linux-4.9.34.orig/net/ipv4/fib_trie.c -+++ linux-4.9.34/net/ipv4/fib_trie.c +--- a/net/ipv4/fib_trie.c ++++ b/net/ipv4/fib_trie.c @@ -2667,10 +2667,12 @@ static const struct file_operations fib_ int __net_init fib_proc_init(struct net *net) @@ -415,10 +379,8 @@ Index: linux-4.9.34/net/ipv4/fib_trie.c remove_proc_entry("route", net->proc_net); } -Index: linux-4.9.34/net/ipv4/proc.c -=================================================================== ---- linux-4.9.34.orig/net/ipv4/proc.c -+++ linux-4.9.34/net/ipv4/proc.c +--- a/net/ipv4/proc.c ++++ b/net/ipv4/proc.c @@ -564,6 +564,9 @@ static __net_initdata struct pernet_oper int __init ip_misc_proc_init(void) @@ -429,10 +391,8 @@ Index: linux-4.9.34/net/ipv4/proc.c return register_pernet_subsys(&ip_proc_ops); } -Index: linux-4.9.34/net/ipv4/route.c -=================================================================== ---- linux-4.9.34.orig/net/ipv4/route.c -+++ linux-4.9.34/net/ipv4/route.c +--- a/net/ipv4/route.c ++++ b/net/ipv4/route.c @@ -420,6 +420,9 @@ static struct pernet_operations ip_rt_pr static int __init ip_rt_proc_init(void) diff --git a/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch b/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch index 947471ae78..4f432c3568 100644 --- a/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch +++ b/target/linux/generic/hack-4.9/904-debloat_dma_buf.patch @@ -11,8 +11,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> kernel/sched/core.c | 1 + 4 files changed, 12 insertions(+), 5 deletions(-) -diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig -index d02e7c0f5bfd..e1c0e2e0d3a8 100644 --- a/drivers/base/Kconfig +++ b/drivers/base/Kconfig @@ -241,7 +241,7 @@ config SOC_BUS @@ -24,8 +22,6 @@ index d02e7c0f5bfd..e1c0e2e0d3a8 100644 default n select ANON_INODES help -diff --git a/drivers/dma-buf/Makefile b/drivers/dma-buf/Makefile -index 210a10bfad2b..36ee68dcdffe 100644 --- a/drivers/dma-buf/Makefile +++ b/drivers/dma-buf/Makefile @@ -1,3 +1,7 @@ @@ -39,8 +35,6 @@ index 210a10bfad2b..36ee68dcdffe 100644 +dma-buf-objs-$(CONFIG_SW_SYNC) += sw_sync.o sync_debug.o + +dma-shared-buffer-objs := $(dma-buf-objs-y) -diff --git a/drivers/dma-buf/dma-buf.c b/drivers/dma-buf/dma-buf.c -index 6b54e02da10c..24e69ef1f243 100644 --- a/drivers/dma-buf/dma-buf.c +++ b/drivers/dma-buf/dma-buf.c @@ -34,6 +34,7 @@ @@ -58,11 +52,9 @@ index 6b54e02da10c..24e69ef1f243 100644 -__exitcall(dma_buf_deinit); +module_exit(dma_buf_deinit); +MODULE_LICENSE("GPL"); -diff --git a/kernel/sched/core.c b/kernel/sched/core.c -index 692c948ae333..eaf379285cca 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c -@@ -2170,6 +2170,7 @@ int wake_up_state(struct task_struct *p, unsigned int state) +@@ -2170,6 +2170,7 @@ int wake_up_state(struct task_struct *p, { return try_to_wake_up(p, state, 0); } @@ -70,6 +62,3 @@ index 692c948ae333..eaf379285cca 100644 /* * This function clears the sched_dl_entity static params. --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/910-kobject_uevent.patch b/target/linux/generic/hack-4.9/910-kobject_uevent.patch index e0befdf171..734401e1c6 100644 --- a/target/linux/generic/hack-4.9/910-kobject_uevent.patch +++ b/target/linux/generic/hack-4.9/910-kobject_uevent.patch @@ -9,7 +9,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> lib/kobject_uevent.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) -diff --git a/include/linux/kobject.h b/include/linux/kobject.h --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@ -52,6 +52,18 @@ static const char *kobject_actions[] = { @@ -30,7 +29,4 @@ diff --git a/include/linux/kobject.h b/include/linux/kobject.h + /** * kobject_action_type - translate action string to numeric type - *--- a/include/linux/kobject.h --- -2.11.0 - + * diff --git a/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch b/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch index e794be52bc..55ce171567 100644 --- a/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch +++ b/target/linux/generic/hack-4.9/911-kobject_add_broadcast_uevent.patch @@ -9,33 +9,29 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> lib/kobject_uevent.c | 37 +++++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+) -diff --git a/include/linux/kobject.h b/include/linux/kobject.h -index a7dc9e61f433..3d6950c957cd 100644 --- a/include/linux/kobject.h +++ b/include/linux/kobject.h -@@ -34,6 +34,8 @@ - - struct sk_buff; +@@ -32,6 +32,8 @@ + #define UEVENT_NUM_ENVP 32 /* number of env pointers */ + #define UEVENT_BUFFER_SIZE 2048 /* buffer for the variables */ +struct sk_buff; + #ifdef CONFIG_UEVENT_HELPER /* path to the userspace helper executed on an event */ extern char uevent_helper[]; -@@ -227,4 +229,7 @@ int kobject_action_type(const char *buf, size_t count, - int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group, - gfp_t allocation); +@@ -222,4 +224,7 @@ int add_uevent_var(struct kobj_uevent_en + int kobject_action_type(const char *buf, size_t count, + enum kobject_action *type); +int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group, + gfp_t allocation); + #endif /* _KOBJECT_H_ */ -diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c -index ac0c7cfa7292..bd13381a410f 100644 --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c -@@ -460,6 +460,43 @@ int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group, - EXPORT_SYMBOL_GPL(broadcast_uevent); +@@ -423,6 +423,43 @@ int add_uevent_var(struct kobj_uevent_en + EXPORT_SYMBOL_GPL(add_uevent_var); #if defined(CONFIG_NET) +int broadcast_uevent(struct sk_buff *skb, __u32 pid, __u32 group, @@ -78,6 +74,3 @@ index ac0c7cfa7292..bd13381a410f 100644 static int uevent_net_init(struct net *net) { struct uevent_sock *ue_sk; --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch b/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch index 7c306bf4ca..6eeddcc3c6 100644 --- a/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch +++ b/target/linux/generic/hack-4.9/921-always-create-console-node-in-initramfs.patch @@ -8,8 +8,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> scripts/gen_initramfs_list.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) -diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh -index 7710113e6a72..b8d6cb30e054 100755 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh @@ -59,6 +59,18 @@ default_initramfs() { @@ -40,6 +38,3 @@ index 7710113e6a72..b8d6cb30e054 100755 echo "${dirlist}" | \ while read x; do ${dep_list}parse ${x} --- -2.11.0 - diff --git a/target/linux/generic/hack-4.9/930-crashlog.patch b/target/linux/generic/hack-4.9/930-crashlog.patch index dfff4c78e8..15d5ef4d67 100644 --- a/target/linux/generic/hack-4.9/930-crashlog.patch +++ b/target/linux/generic/hack-4.9/930-crashlog.patch @@ -19,9 +19,6 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> create mode 100644 include/linux/crashlog.h create mode 100644 kernel/crashlog.c -diff --git a/include/linux/crashlog.h b/include/linux/crashlog.h -new file mode 100644 -index 000000000000..7a9ee6138cc4 --- /dev/null +++ b/include/linux/crashlog.h @@ -0,0 +1,17 @@ @@ -42,8 +39,6 @@ index 000000000000..7a9ee6138cc4 +#endif + +#endif -diff --git a/init/Kconfig b/init/Kconfig -index 9f2c0cabbc97..6d8f388fb9b3 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1298,6 +1298,10 @@ config RELAY @@ -57,8 +52,6 @@ index 9f2c0cabbc97..6d8f388fb9b3 100644 config BLK_DEV_INITRD bool "Initial RAM filesystem and RAM disk (initramfs/initrd) support" depends on BROKEN || !FRV -diff --git a/kernel/Makefile b/kernel/Makefile -index 314e7d62f5f0..5fe0d8c3cb35 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -113,6 +113,7 @@ obj-$(CONFIG_TORTURE_TEST) += torture.o @@ -69,9 +62,6 @@ index 314e7d62f5f0..5fe0d8c3cb35 100644 $(obj)/configs.o: $(obj)/config_data.h -diff --git a/kernel/crashlog.c b/kernel/crashlog.c -new file mode 100644 -index 000000000000..11894b276e54 --- /dev/null +++ b/kernel/crashlog.c @@ -0,0 +1,213 @@ @@ -288,11 +278,9 @@ index 000000000000..11894b276e54 + return 0; +} +module_init(crashlog_init_fs); -diff --git a/kernel/module.c b/kernel/module.c -index 80b5ac4181c6..51d6e4e6f436 100644 --- a/kernel/module.c +++ b/kernel/module.c -@@ -253,6 +253,9 @@ static void mod_update_bounds(struct module *mod) +@@ -253,6 +253,9 @@ static void mod_update_bounds(struct mod #ifdef CONFIG_KGDB_KDB struct list_head *kdb_modules = &modules; /* kdb needs the list of modules */ #endif /* CONFIG_KGDB_KDB */ @@ -302,8 +290,6 @@ index 80b5ac4181c6..51d6e4e6f436 100644 static void module_assert_mutex(void) { -diff --git a/mm/bootmem.c b/mm/bootmem.c -index e8a55a3c9feb..e0f3c0bf2709 100644 --- a/mm/bootmem.c +++ b/mm/bootmem.c @@ -14,6 +14,7 @@ @@ -314,7 +300,7 @@ index e8a55a3c9feb..e0f3c0bf2709 100644 #include <linux/bug.h> #include <linux/io.h> #include <linux/bootmem.h> -@@ -174,6 +175,7 @@ static unsigned long __init free_all_bootmem_core(bootmem_data_t *bdata) +@@ -174,6 +175,7 @@ static unsigned long __init free_all_boo if (!bdata->node_bootmem_map) return 0; @@ -322,8 +308,6 @@ index e8a55a3c9feb..e0f3c0bf2709 100644 map = bdata->node_bootmem_map; start = bdata->node_min_pfn; end = bdata->node_low_pfn; -diff --git a/mm/memblock.c b/mm/memblock.c -index 68849d0ead09..aef9ca5e7f52 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -19,6 +19,7 @@ @@ -334,7 +318,7 @@ index 68849d0ead09..aef9ca5e7f52 100644 #include <asm/sections.h> #include <linux/io.h> -@@ -499,6 +500,8 @@ static void __init_memblock memblock_insert_region(struct memblock_type *type, +@@ -499,6 +500,8 @@ static void __init_memblock memblock_ins memblock_set_region_node(rgn, nid); type->cnt++; type->total_size += size; @@ -343,7 +327,7 @@ index 68849d0ead09..aef9ca5e7f52 100644 } /** -@@ -538,6 +541,8 @@ int __init_memblock memblock_add_range(struct memblock_type *type, +@@ -538,6 +541,8 @@ int __init_memblock memblock_add_range(s type->regions[0].flags = flags; memblock_set_region_node(&type->regions[0], nid); type->total_size = size; @@ -352,6 +336,3 @@ index 68849d0ead09..aef9ca5e7f52 100644 return 0; } repeat: --- -2.11.0 - |