Skip to content

L
linux-davinci
Commit aee6a166 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Ingo Molnar
Browse files
Options

x86: beautify vmlinux_32.lds.S 

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: default avatarSam 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: default avatarIngo Molnar <mingo@elte.hu>
parent 51b26ada
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 176 deletions
arch/x86/kernel/vmlinux_32.lds.S
View file @ aee6a166
...@@ -22,196 +22,220 @@ ENTRY(phys_startup_32) ...@@ -22,196 +22,220 @@ ENTRY(phys_startup_32)
jiffies = jiffies_64; jiffies = jiffies_64;
PHDRS { PHDRS {
text PT_LOAD FLAGS(5); /* R_E */ text PT_LOAD FLAGS(5); /* R_E */
data PT_LOAD FLAGS(7); /* RWE */ data PT_LOAD FLAGS(7); /* RWE */
note PT_NOTE FLAGS(0); /* ___ */ note PT_NOTE FLAGS(0); /* ___ */
} }
SECTIONS 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.head : AT(ADDR(.text.head) - LOAD_OFFSET) { /* Text and read-only data */
_text = .; /* Text and read-only data */ .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
*(.text.head) _text = .;
} :text = 0x9090 *(.text.head)
} :text = 0x9090
/* read-only */
.text : AT(ADDR(.text) - LOAD_OFFSET) { /* read-only */
. = ALIGN(PAGE_SIZE); /* not really needed, already page aligned */ .text : AT(ADDR(.text) - LOAD_OFFSET) {
*(.text.page_aligned) /* not really needed, already page aligned */
TEXT_TEXT . = ALIGN(PAGE_SIZE);
SCHED_TEXT *(.text.page_aligned)
LOCK_TEXT TEXT_TEXT
KPROBES_TEXT SCHED_TEXT
IRQENTRY_TEXT LOCK_TEXT
*(.fixup) KPROBES_TEXT
*(.gnu.warning) IRQENTRY_TEXT
_etext = .; /* End of text section */ *(.fixup)
} :text = 0x9090 *(.gnu.warning)
/* End of text section */
NOTES :text :note _etext = .;
} :text = 0x9090
. = ALIGN(16); /* Exception table */
__ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { NOTES :text :note
__start___ex_table = .;
*(__ex_table) /* Exception table */
__stop___ex_table = .; . = ALIGN(16);
} :text = 0x9090 __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) {
__start___ex_table = .;
RODATA *(__ex_table)
__stop___ex_table = .;
/* writeable */ } :text = 0x9090
. = ALIGN(PAGE_SIZE);
.data : AT(ADDR(.data) - LOAD_OFFSET) { /* Data */ RODATA
DATA_DATA
CONSTRUCTORS /* writeable */
. = ALIGN(PAGE_SIZE);
/* Data */
.data : AT(ADDR(.data) - LOAD_OFFSET) {
DATA_DATA
CONSTRUCTORS
} :data } :data
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
__nosave_begin = .; __nosave_begin = .;
*(.data.nosave) *(.data.nosave)
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__nosave_end = .; __nosave_end = .;
} }
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
.data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
*(.data.page_aligned) *(.data.page_aligned)
*(.data.idt) *(.data.idt)
} }
. = ALIGN(32); . = ALIGN(32);
.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { .data.cacheline_aligned :
*(.data.cacheline_aligned) AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
} *(.data.cacheline_aligned)
}
/* rarely changed data like cpu maps */
. = ALIGN(32); /* rarely changed data like cpu maps */
.data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { . = ALIGN(32);
*(.data.read_mostly) .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) {
_edata = .; /* End of data section */ *(.data.read_mostly)
}
/* End of data section */
. = ALIGN(THREAD_SIZE); /* init_task */ _edata = .;
.data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { }
*(.data.init_task)
} /* init_task */
. = ALIGN(THREAD_SIZE);
/* might get freed after init */ .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
. = ALIGN(PAGE_SIZE); *(.data.init_task)
.smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { }
__smp_locks = .;
*(.smp_locks) . = ALIGN(PAGE_SIZE);
__smp_locks_end = .; .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) {
} /* might get freed after init */
/* will be freed after init __smp_locks = .;
* Following ALIGN() is required to make sure no other data falls on the *(.smp_locks)
* same page where __smp_alt_end is pointing as that page might be freed __smp_locks_end = .;
* after boot. Always make sure that ALIGN() directive is present after }
* the section which contains __smp_alt_end. /* will be freed after init
*/ * Following ALIGN() is required to make sure no other data falls on the
. = ALIGN(PAGE_SIZE); * same page where __smp_alt_end is pointing as that page might be freed
* after boot. Always make sure that ALIGN() directive is present after
/* will be freed after init */ * the section which contains __smp_alt_end.
. = ALIGN(PAGE_SIZE); /* Init code and data */ */
.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) { . = ALIGN(PAGE_SIZE);
__init_begin = .;
_sinittext = .; /* Init code and data - will be freed after init */
INIT_TEXT . = ALIGN(PAGE_SIZE);
_einittext = .; .init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
} __init_begin = .;
.init.data : AT(ADDR(.init.data) - LOAD_OFFSET) { _sinittext = .;
INIT_DATA INIT_TEXT
} _einittext = .;
. = ALIGN(16); }
.init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
__setup_start = .; .init.data : AT(ADDR(.init.data) - LOAD_OFFSET) {
*(.init.setup) INIT_DATA
__setup_end = .; }
}
.initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) { . = ALIGN(16);
__initcall_start = .; .init.setup : AT(ADDR(.init.setup) - LOAD_OFFSET) {
INITCALLS __setup_start = .;
__initcall_end = .; *(.init.setup)
} __setup_end = .;
.con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) { }
__con_initcall_start = .; .initcall.init : AT(ADDR(.initcall.init) - LOAD_OFFSET) {
*(.con_initcall.init) __initcall_start = .;
__con_initcall_end = .; INITCALLS
} __initcall_end = .;
.x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) { }
__x86_cpu_dev_start = .;
*(.x86_cpu_dev.init) .con_initcall.init : AT(ADDR(.con_initcall.init) - LOAD_OFFSET) {
__x86_cpu_dev_end = .; __con_initcall_start = .;
} *(.con_initcall.init)
SECURITY_INIT __con_initcall_end = .;
. = ALIGN(4); }
.altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
__alt_instructions = .; .x86_cpu_dev.init : AT(ADDR(.x86_cpu_dev.init) - LOAD_OFFSET) {
*(.altinstructions) __x86_cpu_dev_start = .;
__alt_instructions_end = .; *(.x86_cpu_dev.init)
} __x86_cpu_dev_end = .;
.altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) { }
*(.altinstr_replacement)
} SECURITY_INIT
. = ALIGN(4);
.parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) { . = ALIGN(4);
__parainstructions = .; .altinstructions : AT(ADDR(.altinstructions) - LOAD_OFFSET) {
*(.parainstructions) __alt_instructions = .;
__parainstructions_end = .; *(.altinstructions)
} __alt_instructions_end = .;
/* .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) { .altinstr_replacement : AT(ADDR(.altinstr_replacement) - LOAD_OFFSET) {
EXIT_TEXT *(.altinstr_replacement)
} }
.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
EXIT_DATA . = ALIGN(4);
} .parainstructions : AT(ADDR(.parainstructions) - LOAD_OFFSET) {
__parainstructions = .;
*(.parainstructions)
__parainstructions_end = .;
}
/*
* .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
}
.exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) {
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) {
__initramfs_start = .; __initramfs_start = .;
*(.init.ramfs) *(.init.ramfs)
__initramfs_end = .; __initramfs_end = .;
} }
#endif #endif
PERCPU(PAGE_SIZE)
. = ALIGN(PAGE_SIZE);
/* freed after init ends here */
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
__init_end = .;
__bss_start = .; /* BSS */
*(.bss.page_aligned)
*(.bss)
. = ALIGN(4);
__bss_stop = .;
}
.brk : AT(ADDR(.brk) - LOAD_OFFSET) { PERCPU(PAGE_SIZE)
. = ALIGN(PAGE_SIZE); . = ALIGN(PAGE_SIZE);
__brk_base = . ; /* freed after init ends here */
. += 64 * 1024 ; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */ /* BSS */
__brk_limit = . ; .bss : AT(ADDR(.bss) - LOAD_OFFSET) {
} __init_end = .;
__bss_start = .;
*(.bss.page_aligned)
*(.bss)
. = ALIGN(4);
__bss_stop = .;
}
.end : AT(ADDR(.end) - LOAD_OFFSET) { .brk : AT(ADDR(.brk) - LOAD_OFFSET) {
_end = . ; . = ALIGN(PAGE_SIZE);
} __brk_base = .;
. += 64 * 1024; /* 64k alignment slop space */
*(.brk_reservation) /* areas brk users have reserved */
__brk_limit = .;
}
/* Sections to be discarded */ .end : AT(ADDR(.end) - LOAD_OFFSET) {
/DISCARD/ : { _end = . ;
*(.exitcall.exit)
*(.discard)
} }
STABS_DEBUG /* Sections to be discarded */
/DISCARD/ : {
*(.exitcall.exit)
*(.discard)
}
DWARF_DEBUG STABS_DEBUG
DWARF_DEBUG
} }
/* /*
......
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