Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 99492c39 authored Apr 03, 2015 by Peter Hurley Committed by Greg Kroah-Hartman Apr 10, 2015

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: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: Peter Hurley <peter@hurleysoftware.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b3e3bf2e

include/asm-generic/vmlinux.lds.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -151,7 +151,7 @@
		#endif

		#ifdef CONFIG_SERIAL_EARLYCON
		#define EARLYCON_TABLE() . = ALIGN(8); \
		#define EARLYCON_TABLE() STRUCT_ALIGN(); \
		VMLINUX_SYMBOL(__earlycon_table) = .; \
		*(__earlycon_table) \
		*(__earlycon_table_end)

include/linux/serial_core.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -342,7 +342,7 @@ struct earlycon_device {
		struct earlycon_id {
		char name[16];
		int (setup)(struct earlycon_device , const char *options);
		};
		} __aligned(32);

		extern int setup_earlycon(char *buf);
		extern int of_setup_earlycon(unsigned long addr,