ACPI: fix acpi_find_child_device() invocation in acpi_preset_companion()

[mirror_ubuntu-bionic-kernel.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index ee8b707d9fa9c6b5ed1e15f655c2b8f118868bf2..4e51d2f098da7a55e39c1591214b0b0b094f8f5a 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -170,7 +170,7 @@
 #endif
 
 #ifdef CONFIG_SERIAL_EARLYCON
-#define EARLYCON_TABLE() STRUCT_ALIGN();                       \
+#define EARLYCON_TABLE() . = ALIGN(8);                         \
                         VMLINUX_SYMBOL(__earlycon_table) = .;  \
                         KEEP(*(__earlycon_table))              \
                         VMLINUX_SYMBOL(__earlycon_table_end) = .;
@@ -699,7 +699,7 @@
                KEEP(*(.orc_unwind_ip))                                 \
                VMLINUX_SYMBOL(__stop_orc_unwind_ip) = .;               \
        }                                                               \
-       . = ALIGN(6);                                                   \
+       . = ALIGN(2);                                                   \
        .orc_unwind : AT(ADDR(.orc_unwind) - LOAD_OFFSET) {             \
                VMLINUX_SYMBOL(__start_orc_unwind) = .;                 \
                KEEP(*(.orc_unwind))                                    \