diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2017-03-01 15:37:58 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2017-03-01 15:40:17 +0100 |
| commit | 23bf153eadc9a1f0fa761155742f2e7107159a0c (patch) | |
| tree | 1e9be513ad6c21189dd2dd934ff596f23d6e8402 /target/linux | |
| parent | 339de8234775f512dbd7cad9064acb327e48abc4 (diff) | |
| download | upstream-23bf153eadc9a1f0fa761155742f2e7107159a0c.tar.gz upstream-23bf153eadc9a1f0fa761155742f2e7107159a0c.tar.bz2 upstream-23bf153eadc9a1f0fa761155742f2e7107159a0c.zip | |
kernel: fix earlycon by keeping __earlycon_table
Somewhere between 4.4 and 4.9 there was a change that made
OF_EARLYCON_DECLARE adding entries to the __earlycon_table instead of
__earlycon_of_table. We need to keep this table as well.
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/generic/patches-4.9/220-gc_sections.patch | 9 | ||||
| -rw-r--r-- | target/linux/generic/patches-4.9/721-phy_packets.patch | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/target/linux/generic/patches-4.9/220-gc_sections.patch b/target/linux/generic/patches-4.9/220-gc_sections.patch index 570083a509..e8a834fbeb 100644 --- a/target/linux/generic/patches-4.9/220-gc_sections.patch +++ b/target/linux/generic/patches-4.9/220-gc_sections.patch @@ -63,6 +63,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org> VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; #else #define TRACE_SYSCALLS() +@@ -156,7 +156,7 @@ + #ifdef CONFIG_SERIAL_EARLYCON + #define EARLYCON_TABLE() STRUCT_ALIGN(); \ + VMLINUX_SYMBOL(__earlycon_table) = .; \ +- *(__earlycon_table) \ ++ KEEP(*(__earlycon_table)) \ + VMLINUX_SYMBOL(__earlycon_table_end) = .; + #else + #define EARLYCON_TABLE() @@ -169,8 +169,8 @@ #define _OF_TABLE_1(name) \ . = ALIGN(8); \ diff --git a/target/linux/generic/patches-4.9/721-phy_packets.patch b/target/linux/generic/patches-4.9/721-phy_packets.patch index 22ca7df862..46e8574b9b 100644 --- a/target/linux/generic/patches-4.9/721-phy_packets.patch +++ b/target/linux/generic/patches-4.9/721-phy_packets.patch @@ -28,7 +28,7 @@ const struct header_ops *header_ops; unsigned int flags; -@@ -1779,6 +1782,10 @@ struct net_device { +@@ -1779,6 +1786,10 @@ struct net_device { struct mpls_dev __rcu *mpls_ptr; #endif |