diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 10:11:12 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2018-05-02 10:11:12 -0400 |
| commit | 604a98f1df2897f9ea6ca6bdab8e1c2d6844be01 (patch) | |
| tree | 99471700986d14cd5cace3e535dfcbd0e07464cb /include/asm-generic | |
| parent | 1cfd904f16740df21b2df7b41c7a0dc00cbd434c (diff) | |
| parent | 7dba33c6346c337aac3f7cd188137d4a6d3d1f3a (diff) | |
Merge branch 'timers/urgent' into timers/core
Pick up urgent fixes to apply dependent cleanup patch
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 278841c75b97..af240573e482 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -188,7 +188,7 @@ | |||
| 188 | #endif | 188 | #endif |
| 189 | 189 | ||
| 190 | #ifdef CONFIG_SERIAL_EARLYCON | 190 | #ifdef CONFIG_SERIAL_EARLYCON |
| 191 | #define EARLYCON_TABLE() STRUCT_ALIGN(); \ | 191 | #define EARLYCON_TABLE() . = ALIGN(8); \ |
| 192 | VMLINUX_SYMBOL(__earlycon_table) = .; \ | 192 | VMLINUX_SYMBOL(__earlycon_table) = .; \ |
| 193 | KEEP(*(__earlycon_table)) \ | 193 | KEEP(*(__earlycon_table)) \ |
| 194 | VMLINUX_SYMBOL(__earlycon_table_end) = .; | 194 | VMLINUX_SYMBOL(__earlycon_table_end) = .; |