Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-leds

[karo-tx-linux.git] / arch / sparc / kernel / vmlinux.lds.S

diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S
index 866390feb6833002efc399a4f9cc6d7f32b31a3e..4e599259396747947c2145e7023cf311636b65d2 100644 (file)
--- a/arch/sparc/kernel/vmlinux.lds.S
+++ b/arch/sparc/kernel/vmlinux.lds.S
@@ -51,70 +51,27 @@ SECTIONS
        _etext = .;
 
        RO_DATA(PAGE_SIZE)
-       .data : {
-               DATA_DATA
-               CONSTRUCTORS
-       }
        .data1 : {
                *(.data1)
        }
-       . = ALIGN(SMP_CACHE_BYTES);
-       .data.cacheline_aligned : {
-               *(.data.cacheline_aligned)
-       }
-       . = ALIGN(SMP_CACHE_BYTES);
-       .data.read_mostly : {
-               *(.data.read_mostly)
-       }
+       RW_DATA_SECTION(SMP_CACHE_BYTES, 0, THREAD_SIZE)
+
        /* End of data section */
        _edata = .;
 
-       /* init_task */
-       . = ALIGN(THREAD_SIZE);
-       .data.init_task : {
-               *(.data.init_task)
-       }
        .fixup : {
                __start___fixup = .;
                *(.fixup)
                __stop___fixup = .;
        }
-       . = ALIGN(16);
-       __ex_table : {
-               __start___ex_table = .;
-               *(__ex_table)
-               __stop___ex_table = .;
-       }
+       EXCEPTION_TABLE(16)
        NOTES
 
        . = ALIGN(PAGE_SIZE);
-       .init.text : {
-               __init_begin = .;
-               _sinittext = .;
-               INIT_TEXT
-               _einittext = .;
-       }
+       __init_begin = ALIGN(PAGE_SIZE);
+       INIT_TEXT_SECTION(PAGE_SIZE)
        __init_text_end = .;
-       .init.data : {
-               INIT_DATA
-       }
-       . = ALIGN(16);
-       .init.setup : {
-               __setup_start = .;
-               *(.init.setup)
-               __setup_end = .;
-       }
-       .initcall.init : {
-               __initcall_start = .;
-               INITCALLS
-               __initcall_end = .;
-       }
-       .con_initcall.init : {
-               __con_initcall_start = .;
-               *(.con_initcall.init)
-               __con_initcall_end = .;
-       }
-       SECURITY_INIT
+       INIT_DATA_SECTION(16)
 
        . = ALIGN(4);
        .tsb_ldquad_phys_patch : {
@@ -146,29 +103,11 @@ SECTIONS
                __sun4v_2insn_patch_end = .;
        }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-       . = ALIGN(PAGE_SIZE);
-       .init.ramfs : {
-               __initramfs_start = .;
-               *(.init.ramfs)
-               __initramfs_end = .;
-       }
-#endif
-
        PERCPU(PAGE_SIZE)
 
        . = ALIGN(PAGE_SIZE);
        __init_end = .;
-       __bss_start = .;
-       .sbss : {
-               *(.sbss)
-               *(.scommon)
-       }
-       .bss : {
-               *(.dynbss)
-               *(.bss)
-               *(COMMON)
-       }
+       BSS_SECTION(0, 0, 0)
        _end = . ;
 
        STABS_DEBUG