leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86: beautify vmlinux_32.lds.S

Browse Source 
Beautify vmlinux_32.lds.S:

 - Use tabs for indent
 - Located curly braces like in C code
 - Rearranged a few comments

To see actual differences use "git diff -b" which
ignore 'whitespace' changes.

The beautification is done to prepare a unification
of the _32 and _64 variants of the linker scripts.

[ Impact: cleanup ]

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Tim Abbott <tabbott@MIT.EDU>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
LKML-Reference: <1240991249-27117-1-git-send-email-sam@ravnborg.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Sam Ravnborg 2009-04-29 09:47:17 +02:00 committed by Ingo Molnar
parent 51b26ada79
commit aee6a166a5
1 changed files with 199 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
arch/x86/kernel/vmlinux_32.lds.S
View File

@ -31,14 +31,16 @@ SECTIONS
. = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR;
phys_startup_32 = startup_32 - LOAD_OFFSET; phys_startup_32 = startup_32 - LOAD_OFFSET;
/* Text and read-only data */
.text.head : AT(ADDR(.text.head) - LOAD_OFFSET) { .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
_text = .; /* Text and read-only data */ _text = .;
*(.text.head) *(.text.head)
} :text = 0x9090 } :text = 0x9090
/* read-only */ /* read-only */
.text : AT(ADDR(.text) - LOAD_OFFSET) { .text : AT(ADDR(.text) - LOAD_OFFSET) {
. = ALIGN(PAGE_SIZE); /* not really needed, already page aligned */ /* not really needed, already page aligned */
. = ALIGN(PAGE_SIZE);
*(.text.page_aligned) *(.text.page_aligned)
TEXT_TEXT TEXT_TEXT
SCHED_TEXT SCHED_TEXT
@ -47,12 +49,14 @@ SECTIONS
IRQENTRY_TEXT IRQENTRY_TEXT
*(.fixup) *(.fixup)
*(.gnu.warning) *(.gnu.warning)
_etext = .; /* End of text section */ /* End of text section */
_etext = .;
} :text = 0x9090 } :text = 0x9090
NOTES :text :note NOTES :text :note
. = ALIGN(16); /* Exception table */ /* Exception table */
. = ALIGN(16);
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
__start___ex_table = .; __start___ex_table = .;
*(__ex_table) *(__ex_table)
@ -63,7 +67,8 @@ SECTIONS
/* writeable */ /* writeable */
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ /* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
DATA_DATA DATA_DATA
CONSTRUCTORS CONSTRUCTORS
} :data } :data
@ -83,7 +88,8 @@ SECTIONS
} }
. = ALIGN(32); . = ALIGN(32);
.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { .data.cacheline_aligned :
AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
*(.data.cacheline_aligned) *(.data.cacheline_aligned)
} }
@ -91,17 +97,20 @@ SECTIONS
. = ALIGN(32); . = ALIGN(32);
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
*(.data.read_mostly) *(.data.read_mostly)
_edata = .; /* End of data section */
/* End of data section */
_edata = .;
} }
. = ALIGN(THREAD_SIZE); /* init_task */ /* init_task */
. = ALIGN(THREAD_SIZE);
.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
*(.data.init_task) *(.data.init_task)
} }
/* might get freed after init */
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
/* might get freed after init */
__smp_locks = .; __smp_locks = .;
*(.smp_locks) *(.smp_locks)
__smp_locks_end = .; __smp_locks_end = .;
@ -114,17 +123,19 @@ SECTIONS
*/ */
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
/* will be freed after init */ /* Init code and data - will be freed after init */
. = ALIGN(PAGE_SIZE); /* Init code and data */ . = ALIGN(PAGE_SIZE);
.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
__init_begin = .; __init_begin = .;
_sinittext = .; _sinittext = .;
INIT_TEXT INIT_TEXT
_einittext = .; _einittext = .;
} }
.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
INIT_DATA INIT_DATA
} }
. = ALIGN(16); . = ALIGN(16);
.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) { .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
__setup_start = .; __setup_start = .;
@ -136,40 +147,51 @@ SECTIONS
INITCALLS INITCALLS
__initcall_end = .; __initcall_end = .;
} }
.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
__con_initcall_start = .; __con_initcall_start = .;
*(.con_initcall.init) *(.con_initcall.init)
__con_initcall_end = .; __con_initcall_end = .;
} }
.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
__x86_cpu_dev_start = .; __x86_cpu_dev_start = .;
*(.x86_cpu_dev.init) *(.x86_cpu_dev.init)
__x86_cpu_dev_end = .; __x86_cpu_dev_end = .;
} }
SECURITY_INIT SECURITY_INIT
. = ALIGN(4); . = ALIGN(4);
.altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) { .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
__alt_instructions = .; __alt_instructions = .;
*(.altinstructions) *(.altinstructions)
__alt_instructions_end = .; __alt_instructions_end = .;
} }
.altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) { .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
*(.altinstr_replacement) *(.altinstr_replacement)
} }
. = ALIGN(4); . = ALIGN(4);
.parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) { .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
__parainstructions = .; __parainstructions = .;
*(.parainstructions) *(.parainstructions)
__parainstructions_end = .; __parainstructions_end = .;
} }
/* .exit.text is discard at runtime, not link time, to deal with references
from .altinstructions and .eh_frame */ /*
* .exit.text is discard at runtime, not link time, to deal with
* references from .altinstructions and .eh_frame
*/
.exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) {
EXIT_TEXT EXIT_TEXT
} }
.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
EXIT_DATA EXIT_DATA
} }
#if defined(CONFIG_BLK_DEV_INITRD) #if defined(CONFIG_BLK_DEV_INITRD)
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) { .init.ramfs : AT(ADDR(.init.ramfs) - LOAD_OFFSET) {
@ -178,13 +200,16 @@ SECTIONS
__initramfs_end = .; __initramfs_end = .;
} }
#endif #endif
PERCPU(PAGE_SIZE) PERCPU(PAGE_SIZE)
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
/* freed after init ends here */ /* freed after init ends here */
/* BSS */
.bss : AT(ADDR(.bss) - LOAD_OFFSET) { .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
__init_end = .; __init_end = .;
__bss_start = .; /* BSS */ __bss_start = .;
*(.bss.page_aligned) *(.bss.page_aligned)
*(.bss) *(.bss)
. = ALIGN(4); . = ALIGN(4);
@ -193,10 +218,10 @@ SECTIONS
.brk : AT(ADDR(.brk) - LOAD_OFFSET) { .brk : AT(ADDR(.brk) - LOAD_OFFSET) {
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__brk_base = . ; __brk_base = .;
. += 64 * 1024 ; /* 64k alignment slop space */ . += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */ *(.brk_reservation) /* areas brk users have reserved */
__brk_limit = . ; __brk_limit = .;
} }
.end : AT(ADDR(.end) - LOAD_OFFSET) { .end : AT(ADDR(.end) - LOAD_OFFSET) {
@ -210,7 +235,6 @@ SECTIONS
} }
STABS_DEBUG STABS_DEBUG
DWARF_DEBUG DWARF_DEBUG
} }