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 c366a8b326ee4ab2bedc6f3ebf0b9ca3c1701e0d..5b2ffcc6e2b2f50db26ead76ba384118065b79e1 100644 (file)
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -12,6 +12,7 @@
  */
 
 #include <linux/config.h>
+
 #define VMLINUX_SYMBOL(_sym_) _##_sym_
 #include <asm-generic/vmlinux.lds.h>
 
@@ -42,6 +43,19 @@
                        *(.rodata) *(.rodata.*)                               \
                        *(__vermagic)           /* Kernel version magic */    \
                        *(.rodata1)                                           \
+               /* PCI quirks */                                              \
+               ___start_pci_fixups_early = . ;                               \
+                       *(.pci_fixup_early)                                   \
+               ___end_pci_fixups_early = . ;                                 \
+               ___start_pci_fixups_header = . ;                              \
+                       *(.pci_fixup_header)                                  \
+               ___end_pci_fixups_header = . ;                                \
+               ___start_pci_fixups_final = . ;                               \
+                       *(.pci_fixup_final)                                   \
+               ___end_pci_fixups_final = . ;                                 \
+               ___start_pci_fixups_enable = . ;                              \
+                       *(.pci_fixup_enable)                                  \
+               ___end_pci_fixups_enable = . ;                                \
                /* Kernel symbol table: Normal symbols */                     \
                ___start___ksymtab = .;                                       \
                        *(__ksymtab)                                          \
@@ -50,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 */                     \
@@ -60,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 = .;                                         \