Commit 99492c39 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

earlycon: Fix __earlycon_table stride

The compiler and the linker must agree on the alignment of
struct earlycon_id; empirical testing and commit 07fca0e5
("tracing: Properly align linker defined symbols") suggests
32-byte alignment is the LCD.
Reported-by: default avatarYinghai Lu <yinghai@kernel.org>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b3e3bf2e
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
#endif #endif
#ifdef CONFIG_SERIAL_EARLYCON #ifdef CONFIG_SERIAL_EARLYCON
#define EARLYCON_TABLE() . = ALIGN(8); \ #define EARLYCON_TABLE() STRUCT_ALIGN(); \
VMLINUX_SYMBOL(__earlycon_table) = .; \ VMLINUX_SYMBOL(__earlycon_table) = .; \
*(__earlycon_table) \ *(__earlycon_table) \
*(__earlycon_table_end) *(__earlycon_table_end)
......
...@@ -342,7 +342,7 @@ struct earlycon_device { ...@@ -342,7 +342,7 @@ struct earlycon_device {
struct earlycon_id { struct earlycon_id {
char name[16]; char name[16];
int (*setup)(struct earlycon_device *, const char *options); int (*setup)(struct earlycon_device *, const char *options);
}; } __aligned(32);
extern int setup_earlycon(char *buf); extern int setup_earlycon(char *buf);
extern int of_setup_earlycon(unsigned long addr, extern int of_setup_earlycon(unsigned long addr,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment