diff options
| author | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-13 11:33:57 +0100 |
|---|---|---|
| committer | Koen Vandeputte <koen.vandeputte@ncentric.com> | 2019-02-14 16:45:01 +0100 |
| commit | a23a13dec27109bbd7171921ec9a89154aabbf26 (patch) | |
| tree | 36061a8e7178dbc263f8ca579b220dc72ed811a8 /target/linux | |
| parent | 880f8e6d32871ade7d2bb2ec541eea113183e9a9 (diff) | |
| download | upstream-a23a13dec27109bbd7171921ec9a89154aabbf26.tar.gz upstream-a23a13dec27109bbd7171921ec9a89154aabbf26.tar.bz2 upstream-a23a13dec27109bbd7171921ec9a89154aabbf26.zip | |
kernel: bump 4.9 to 4.9.156
Refreshed all patches.
Compile-tested on: ar7
Runtime-tested on: none
Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/hack-4.9/204-module_strip.patch | 10 | ||||
| -rw-r--r-- | target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch | 4 |
2 files changed, 7 insertions, 7 deletions
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 c6484a8f92..fcca6bd02c 100644 --- a/target/linux/generic/hack-4.9/204-module_strip.patch +++ b/target/linux/generic/hack-4.9/204-module_strip.patch @@ -137,7 +137,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1965,7 +1965,9 @@ static void read_symbols(char *modname) +@@ -1967,7 +1967,9 @@ static void read_symbols(char *modname) symname = remove_dot(info.strtab + sym->st_name); handle_modversions(mod, &info, sym, symname); @@ -147,7 +147,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } if (!is_vmlinux(modname) || (is_vmlinux(modname) && vmlinux_section_warnings)) -@@ -2109,7 +2111,9 @@ static void add_header(struct buffer *b, +@@ -2111,7 +2113,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"); @@ -157,7 +157,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> buf_printf(b, "\n"); buf_printf(b, "__visible struct module __this_module\n"); buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); -@@ -2126,24 +2130,30 @@ static void add_header(struct buffer *b, +@@ -2128,24 +2132,30 @@ static void add_header(struct buffer *b, static void add_intree_flag(struct buffer *b, int is_intree) { @@ -188,7 +188,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } /* In kernel, this size is defined in linux/module.h; -@@ -2247,11 +2257,13 @@ static void add_depends(struct buffer *b +@@ -2249,11 +2259,13 @@ static void add_depends(struct buffer *b static void add_srcversion(struct buffer *b, struct module *mod) { @@ -202,7 +202,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name> } static void write_if_changed(struct buffer *b, const char *fname) -@@ -2486,7 +2498,9 @@ int main(int argc, char **argv) +@@ -2488,7 +2500,9 @@ int main(int argc, char **argv) add_staging_flag(&buf, mod->name); err |= add_versions(&buf, mod); add_depends(&buf, mod, modules); diff --git a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch index 4e13ec950c..00a5309dcf 100644 --- a/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch +++ b/target/linux/ixp4xx/patches-4.9/160-delayed_uart_io.patch @@ -18,7 +18,7 @@ uart->capabilities = up->capabilities; --- a/drivers/tty/serial/serial_core.c +++ b/drivers/tty/serial/serial_core.c -@@ -2254,6 +2254,7 @@ uart_report_port(struct uart_driver *drv +@@ -2260,6 +2260,7 @@ uart_report_port(struct uart_driver *drv snprintf(address, sizeof(address), "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); break; @@ -26,7 +26,7 @@ case UPIO_MEM: case UPIO_MEM16: case UPIO_MEM32: -@@ -2918,6 +2919,7 @@ int uart_match_port(struct uart_port *po +@@ -2924,6 +2925,7 @@ int uart_match_port(struct uart_port *po case UPIO_HUB6: return (port1->iobase == port2->iobase) && (port1->hub6 == port2->hub6); |