diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:46:14 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-01-29 06:46:14 -0500 |
commit | 5ea293a9048d3a58cb0c840fa719d85ad14cba47 (patch) | |
tree | 88d1dd1eece2cfcbd858ff2c00fb0240dcfab3c7 /arch/parisc/kernel | |
parent | 03bc26cfefd6db756e6bc7fcda11dc17ada7be16 (diff) | |
parent | d3883ecebbf9e095b9e379dabbbe8b2c1ee7a41c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild: (79 commits)
Remove references to "make dep"
kconfig: document use of HAVE_*
Introduce new section reference annotations tags: __ref, __refdata, __refconst
kbuild: warn about ld added unique sections
kbuild: add verbose option to Section mismatch reporting in modpost
kconfig: tristate choices with mixed tristate and boolean values
asm-generic/vmlix.lds.h: simplify __mem{init,exit}* dependencies
remove __attribute_used__
kbuild: support ARCH=x86 in buildtar
kconfig: remove "enable"
kbuild: simplified warning report in modpost
kbuild: introduce a few helpers in modpost
kbuild: use simpler section mismatch warnings in modpost
kbuild: link vmlinux.o before kallsyms passes
kbuild: introduce new option to enhance section mismatch analysis
Use separate sections for __dev/__cpu/__mem code/data
compiler.h: introduce __section()
all archs: consolidate init and exit sections in vmlinux.lds.h
kbuild: check section names consistently in modpost
kbuild: introduce blacklisting in modpost
...
Diffstat (limited to 'arch/parisc/kernel')
-rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index 40d0ff9b81a..50b4a3a25d0 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -172,11 +172,11 @@ SECTIONS | |||
172 | __init_begin = .; | 172 | __init_begin = .; |
173 | .init.text : { | 173 | .init.text : { |
174 | _sinittext = .; | 174 | _sinittext = .; |
175 | *(.init.text) | 175 | INIT_TEXT |
176 | _einittext = .; | 176 | _einittext = .; |
177 | } | 177 | } |
178 | .init.data : { | 178 | .init.data : { |
179 | *(.init.data) | 179 | INIT_DATA |
180 | } | 180 | } |
181 | . = ALIGN(16); | 181 | . = ALIGN(16); |
182 | .init.setup : { | 182 | .init.setup : { |
@@ -215,10 +215,10 @@ SECTIONS | |||
215 | * from .altinstructions and .eh_frame | 215 | * from .altinstructions and .eh_frame |
216 | */ | 216 | */ |
217 | .exit.text : { | 217 | .exit.text : { |
218 | *(.exit.text) | 218 | EXIT_TEXT |
219 | } | 219 | } |
220 | .exit.data : { | 220 | .exit.data : { |
221 | *(.exit.data) | 221 | EXIT_DATA |
222 | } | 222 | } |
223 | #ifdef CONFIG_BLK_DEV_INITRD | 223 | #ifdef CONFIG_BLK_DEV_INITRD |
224 | . = ALIGN(PAGE_SIZE); | 224 | . = ALIGN(PAGE_SIZE); |