aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/include/linux/serial_core.h
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2015-04-03 08:57:51 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-04-10 14:39:53 +0200
commit99492c39f39fc2d8c4ae36ecfb88d7de5d8106b5 (patch)
tree745d2707881decb96bf8ca0746c02d22f088e5e8 /include/linux/serial_core.h
parentMerge 4.0-rc7 into tty-next (diff)
downloadwireguard-linux-99492c39f39fc2d8c4ae36ecfb88d7de5d8106b5.tar.xz
wireguard-linux-99492c39f39fc2d8c4ae36ecfb88d7de5d8106b5.zip
earlycon: Fix __earlycon_table stride
The compiler and the linker must agree on the alignment of struct earlycon_id; empirical testing and commit 07fca0e57fca92 ("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>
Diffstat (limited to 'include/linux/serial_core.h')
-rw-r--r--include/linux/serial_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h
index 34de16840152..025dad9dcde4 100644
--- a/include/linux/serial_core.h
+++ b/include/linux/serial_core.h
@@ -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,