Commit ce19076b authored by Richard Henderson's avatar Richard Henderson

[ALPHA] Corrections to recent vmlinux.lds.S changes.

Fix merge conflicts with asm-generic/vmlinux.lds.h change.
Fix ordering of large alignment data sections.
parent 4edfd8c3
...@@ -21,41 +21,30 @@ SECTIONS ...@@ -21,41 +21,30 @@ SECTIONS
*(.gnu.warning) *(.gnu.warning)
} :kernel } :kernel
_etext = .; /* End of text section */ _etext = .; /* End of text section */
RODATA
. = ALIGN(16); . = ALIGN(16);
__start___ex_table = .; /* Exception table */ __start___ex_table = .; /* Exception table */
__ex_table : { *(__ex_table) } __ex_table : { *(__ex_table) }
__stop___ex_table = .; __stop___ex_table = .;
. = ALIGN(8); RODATA
__start___ksymtab = .; /* Kernel symbol table */
__ksymtab : { *(__ksymtab) }
__stop___ksymtab = .;
. = ALIGN(8);
__start___gpl_ksymtab = .; /* kernel symbol table - GPL-only symbols */
__gpl_ksymtab : { *(__gpl_ksymtab) }
__stop___gpl_ksymtab = .;
. = ALIGN(8);
__start___kallsyms = .; /* All kernel symbols */
__kallsyms : { *(__kallsyms) }
__stop___kallsyms = .;
/* Will be freed after init */ /* Will be freed after init */
. = ALIGN(8192); /* Init code and data */ . = ALIGN(8192); /* Init code and data */
__init_begin = .; __init_begin = .;
.init.text : { *(.init.text) } .init.text : { *(.init.text) }
.init.data : { *(.init.data) } .init.data : { *(.init.data) }
. = ALIGN(16); . = ALIGN(16);
__setup_start = .; __setup_start = .;
.init.setup : { *(.init.setup) } .init.setup : { *(.init.setup) }
__setup_end = .; __setup_end = .;
. = ALIGN(8); . = ALIGN(8);
__start___param = .; __start___param = .;
__param : { *(__param) } __param : { *(__param) }
__stop___param = .; __stop___param = .;
. = ALIGN(8); . = ALIGN(8);
__initcall_start = .; __initcall_start = .;
.initcall.init : { .initcall.init : {
...@@ -68,24 +57,23 @@ SECTIONS ...@@ -68,24 +57,23 @@ SECTIONS
*(.initcall7.init) *(.initcall7.init)
} }
__initcall_end = .; __initcall_end = .;
. = ALIGN(8192); . = ALIGN(8192);
__initramfs_start = .; __initramfs_start = .;
.init.ramfs : { *(.init.ramfs) } .init.ramfs : { *(.init.ramfs) }
__initramfs_end = .; __initramfs_end = .;
. = ALIGN(64); . = ALIGN(64);
__per_cpu_start = .; __per_cpu_start = .;
.data.percpu : { *(.data.percpu) } .data.percpu : { *(.data.percpu) }
__per_cpu_end = .; __per_cpu_end = .;
. = ALIGN(8192);
. = ALIGN(2*8192);
__init_end = .; __init_end = .;
/* Freed after init ends here */ /* Freed after init ends here */
/* writeable */ /* Note 2 page alignment above. */
_data = .; .data.init_thread : { *(.data.init_thread) }
.data : { /* Data */
*(.data)
CONSTRUCTORS
}
. = ALIGN(8192); . = ALIGN(8192);
.data.page_aligned : { *(.data.page_aligned) } .data.page_aligned : { *(.data.page_aligned) }
...@@ -93,14 +81,17 @@ SECTIONS ...@@ -93,14 +81,17 @@ SECTIONS
. = ALIGN(64); . = ALIGN(64);
.data.cacheline_aligned : { *(.data.cacheline_aligned) } .data.cacheline_aligned : { *(.data.cacheline_aligned) }
_data = .;
.data : { /* Data */
*(.data)
CONSTRUCTORS
}
.got : { *(.got) } .got : { *(.got) }
.sdata : { *(.sdata) } .sdata : { *(.sdata) }
_edata = .; /* End of data section */ _edata = .; /* End of data section */
. = ALIGN(2*8192); /* Inititial task and stack */
.data.init_thread : { *(.data.init_thread) }
__bss_start = .; __bss_start = .;
.sbss : { *(.sbss) *(.scommon) } .sbss : { *(.sbss) *(.scommon) }
.bss : { *(.bss) *(COMMON) } .bss : { *(.bss) *(COMMON) }
...@@ -111,7 +102,6 @@ SECTIONS ...@@ -111,7 +102,6 @@ SECTIONS
/* Sections to be discarded */ /* Sections to be discarded */
/DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) } /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
.mdebug 0 : { *(.mdebug) } .mdebug 0 : { *(.mdebug) }
.note 0 : { *(.note) } .note 0 : { *(.note) }
.comment 0 : { *(.comment) } .comment 0 : { *(.comment) }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment