Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 153708
b: refs/heads/master
c: 2e8b5a0
h: refs/heads/master
v: v3
  • Loading branch information
David Howells authored and Linus Torvalds committed Jun 22, 2009
1 parent 72af5e6 commit b522529
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 45 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: eadfe21989d728b5af936487627b4e288bd805f8
refs/heads/master: 2e8b5a09ebf1f98f02c1988a48415e89d4c25168
60 changes: 16 additions & 44 deletions trunk/arch/mn10300/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
Expand Up @@ -38,42 +38,30 @@ SECTIONS

_etext = .; /* End of text section */

. = ALIGN(16); /* Exception table */
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;

EXCEPTION_TABLE(16)
BUG_TABLE

RODATA
RO_DATA(PAGE_SIZE)

/* writeable */
.data : { /* Data */
DATA_DATA
CONSTRUCTORS
}

. = ALIGN(PAGE_SIZE);
__nosave_begin = .;
.data_nosave : { *(.data.nosave) }
. = ALIGN(PAGE_SIZE);
__nosave_end = .;

. = ALIGN(PAGE_SIZE);
.data.page_aligned : { *(.data.idt) }
.data_nosave : { NOSAVE_DATA; }

. = ALIGN(32);
.data.cacheline_aligned : { *(.data.cacheline_aligned) }
.data.page_aligned : { PAGE_ALIGNED_DATA(PAGE_SIZE); }
.data.cacheline_aligned : { CACHELINE_ALIGNED_DATA(32); }

/* rarely changed data like cpu maps */
. = ALIGN(32);
.data.read_mostly : AT(ADDR(.data.read_mostly)) {
*(.data.read_mostly)
READ_MOSTLY_DATA(32);
_edata = .; /* End of data section */
}

. = ALIGN(THREAD_SIZE); /* init_task */
.data.init_task : { *(.data.init_task) }
.data.init_task : { INIT_TASK(THREAD_SIZE); }

/* might get freed after init */
. = ALIGN(PAGE_SIZE);
Expand All @@ -88,23 +76,18 @@ SECTIONS
__init_begin = .;
.init.text : {
_sinittext = .;
*(.init.text)
INIT_TEXT;
_einittext = .;
}
.init.data : { *(.init.data) }
. = ALIGN(16);
__setup_start = .;
.setup.init : { KEEP(*(.init.setup)) }
__setup_end = .;
.init.data : { INIT_DATA; }
.setup.init : { INIT_SETUP(16); }

__initcall_start = .;
.initcall.init : {
INITCALLS
}
__initcall_end = .;
__con_initcall_start = .;
.con_initcall.init : { *(.con_initcall.init) }
__con_initcall_end = .;
.con_initcall.init : { CON_INITCALL; }

SECURITY_INIT
. = ALIGN(4);
Expand All @@ -114,28 +97,17 @@ SECTIONS
.altinstr_replacement : { *(.altinstr_replacement) }
/* .exit.text is discard at runtime, not link time, to deal with references
from .altinstructions and .eh_frame */
.exit.text : { *(.exit.text) }
.exit.data : { *(.exit.data) }
.exit.text : { EXIT_TEXT; }
.exit.data : { EXIT_DATA; }

#ifdef CONFIG_BLK_DEV_INITRD
. = ALIGN(PAGE_SIZE);
__initramfs_start = .;
.init.ramfs : { *(.init.ramfs) }
__initramfs_end = .;
#endif
.init.ramfs : { INIT_RAM_FS; }

PERCPU(32)
. = ALIGN(PAGE_SIZE);
__init_end = .;
/* freed after init ends here */

__bss_start = .; /* BSS */
.bss : {
*(.bss.page_aligned)
*(.bss)
}
. = ALIGN(4);
__bss_stop = .;
BSS(4)

_end = . ;

Expand All @@ -145,7 +117,7 @@ SECTIONS

/* Sections to be discarded */
/DISCARD/ : {
*(.exitcall.exit)
EXIT_CALL
}

STABS_DEBUG
Expand Down

0 comments on commit b522529

Please sign in to comment.