Merge branch 'mv-merge'

[sfrench/cifs-2.6.git] / arch / v850 / kernel / vmlinux.lds.S

diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index 5be05f47109e478fa608f4cf2a41eadccd84b677..5b2ffcc6e2b2f50db26ead76ba384118065b79e1 100644 (file)
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -64,6 +64,10 @@
                ___start___ksymtab_gpl = .;                                   \
                        *(__ksymtab_gpl)                                      \
                ___stop___ksymtab_gpl = .;                                    \
+               /* Kernel symbol table: GPL-future symbols */                 \
+               ___start___ksymtab_gpl_future = .;                            \
+                       *(__ksymtab_gpl_future)                               \
+               ___stop___ksymtab_gpl_future = .;                             \
                /* Kernel symbol table: strings */                            \
                        *(__ksymtab_strings)                                  \
                /* Kernel symbol table: Normal symbols */                     \
@@ -74,6 +78,10 @@
                ___start___kcrctab_gpl = .;                                   \
                        *(__kcrctab_gpl)                                      \
                ___stop___kcrctab_gpl = .;                                    \
+               /* Kernel symbol table: GPL-future symbols */                 \
+               ___start___kcrctab_gpl_future = .;                            \
+                       *(__kcrctab_gpl_future)                               \
+               ___stop___kcrctab_gpl_future = .;                             \
                /* Built-in module parameters */                              \
                . = ALIGN (4) ;                                               \
                ___start___param = .;                                         \