[SCSI] Merge up to linux-2.6 head

[pandora-kernel.git] / arch / v850 / kernel / vmlinux.lds.S

diff --git a/arch/v850/kernel/vmlinux.lds.S b/arch/v850/kernel/vmlinux.lds.S
index 6339921..6172599 100644 (file)
--- a/arch/v850/kernel/vmlinux.lds.S
+++ b/arch/v850/kernel/vmlinux.lds.S
@@ -90,8 +90,9 @@
 
 /* Kernel text segment, and some constant data areas.  */
 #define TEXT_CONTENTS                                                        \
+               _text = .;                                                    \
                __stext = . ;                                                 \
-               *(.text)                                                      \
+               TEXT_TEXT                                                     \
                SCHED_TEXT                                                    \
                        *(.exit.text)   /* 2.5 convention */                  \
                        *(.text.exit)   /* 2.4 convention */                  \
@@ -112,7 +113,7 @@
 /* Kernel data segment.  */
 #define DATA_CONTENTS                                                        \
                __sdata = . ;                                                 \
-               *(.data)                                                      \
+               DATA_DATA                                                     \
                        *(.exit.data)   /* 2.5 convention */                  \
                        *(.data.exit)   /* 2.4 convention */                  \
                . = ALIGN (16) ;                                              \
@@ -140,13 +141,7 @@
                ___setup_end = . ;                                            \
                ___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 = .;                                    \
@@ -195,12 +190,16 @@
                __root_fs_image_start = . ;                                   \
                *(.root)                                                      \
                __root_fs_image_end = . ;
+
+#ifdef CONFIG_BLK_DEV_INITRD
 /* The initramfs archive.  */
 #define INITRAMFS_CONTENTS                                                   \
                . = ALIGN (4) ;                                               \
                ___initramfs_start = . ;                                      \
                        *(.init.ramfs)                                        \
                ___initramfs_end = . ;
+#endif
+
 /* Where the initial bootmap (bitmap for the boot-time memory allocator) 
    should be place.  */
 #define BOOTMAP_CONTENTS                                                     \