Merge tag 'tty-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

[linux-2.6-block.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 5c48c58514e551ab66ee158802aec6fe3905ea69..8bd374d3cf21fb0ee32e217f7f7eb6915c992514 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -153,6 +153,14 @@
 #define TRACE_SYSCALLS()
 #endif
 
+#ifdef CONFIG_SERIAL_EARLYCON
+#define EARLYCON_TABLE() STRUCT_ALIGN();                       \
+                        VMLINUX_SYMBOL(__earlycon_table) = .;  \
+                        *(__earlycon_table)                    \
+                        *(__earlycon_table_end)
+#else
+#define EARLYCON_TABLE()
+#endif
 
 #define ___OF_TABLE(cfg, name) _OF_TABLE_##cfg(name)
 #define __OF_TABLE(cfg, name)  ___OF_TABLE(cfg, name)
@@ -508,6 +516,7 @@
        CPUIDLE_METHOD_OF_TABLES()                                      \
        KERNEL_DTB()                                                    \
        IRQCHIP_OF_MATCH_TABLE()                                        \
+       EARLYCON_TABLE()                                                \
        EARLYCON_OF_TABLES()
 
 #define INIT_TEXT                                                      \