fedora core 6 1.2949 + vserver 2.2.0

[linux-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 07ab0f2..3a5fd07 100644 (file)
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -1,8 +1,8 @@
 /*
  * arch/v850/vmlinux.lds.S -- kernel linker script for v850 platforms
  *
- *  Copyright (C) 2002,03  NEC Electronics Corporation
- *  Copyright (C) 2002,03  Miles Bader <miles@gnu.org>
+ *  Copyright (C) 2002,03,04,05  NEC Electronics Corporation
+ *  Copyright (C) 2002,03,04,05  Miles Bader <miles@gnu.org>
  *
  * This file is subject to the terms and conditions of the GNU General
  * Public License.  See the file COPYING in the main directory of this
@@ -11,7 +11,8 @@
  * Written by Miles Bader <miles@gnu.org>
  */
 
-#include <linux/config.h>
+
+#define VMLINUX_SYMBOL(_sym_) _##_sym_
 #include <asm-generic/vmlinux.lds.h>
 
 /* For most platforms, this will define useful things like RAM addr/size.  */
@@ -41,6 +42,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)                                          \
@@ -49,6 +63,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 */                     \
@@ -59,12 +77,23 @@
                ___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 = .;                                         \
+               *(__param)                                                    \
+               ___stop___param = .;
+
 
 /* Kernel text segment, and some constant data areas.  */
 #define TEXT_CONTENTS                                                        \
+               _text = .;                                                    \
                __stext = . ;                                                 \
                *(.text)                                                      \
-               SCHED_TEXT
+               SCHED_TEXT                                                    \
                        *(.exit.text)   /* 2.5 convention */                  \
                        *(.text.exit)   /* 2.4 convention */                  \
                        *(.text.lock)                                         \
@@ -110,18 +139,9 @@
                        *(.init.setup)  /* 2.5 convention */                  \
                        *(.setup.init)  /* 2.4 convention */                  \
                ___setup_end = . ;                                            \
-               ___start___param = . ;                                        \
-                       *(__param)                                            \
-               ___stop___param = . ;                                         \
                ___initcall_start = . ;                                       \
                        *(.initcall.init)                                     \
-                       *(.initcall1.init)                                    \
-                       *(.initcall2.init)                                    \
-                       *(.initcall3.init)                                    \
-                       *(.initcall4.init)                                    \
-                       *(.initcall5.init)                                    \
-                       *(.initcall6.init)                                    \
-                       *(.initcall7.init)                                    \
+                       INITCALLS                                             \
                . = ALIGN (4) ;                                               \
                ___initcall_end = . ;                                         \
                ___con_initcall_start = .;                                    \