aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/vmlinux.lds.S
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-16 16:44:28 -0400
committerH. Peter Anvin <hpa@zytor.com>2009-09-18 10:21:50 -0700
commit4ae59b916d269255800d69a07ac5b0c368a417f8 (patch)
tree8b4ae70e861c8cc28b463709b00d4b0b11b0681f /arch/x86/kernel/vmlinux.lds.S
parent1dc818c1c574a4caa7b575bd9018d04090fb6c86 (diff)
downloadkernel_samsung_smdk4412-4ae59b916d269255800d69a07ac5b0c368a417f8.zip
kernel_samsung_smdk4412-4ae59b916d269255800d69a07ac5b0c368a417f8.tar.gz
kernel_samsung_smdk4412-4ae59b916d269255800d69a07ac5b0c368a417f8.tar.bz2
x86: convert to use __HEAD and HEAD_TEXT macros.
This has the consequence of changing the section name use for head code from ".text.head" to ".head.text". It also eliminates the ".text.head" output section (instead placing head code at the start of the .text output section), which should be harmless. This patch only changes the sections in the actual kernel, not those in the compressed boot loader. Signed-off-by: Tim Abbott <tabbott@ksplice.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/vmlinux.lds.S')
-rw-r--r--arch/x86/kernel/vmlinux.lds.S12
1 files changed, 3 insertions, 9 deletions
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index b96ca47..5c7826d 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -65,17 +65,11 @@ SECTIONS
#endif
/* Text and read-only data */
-
- /* bootstrapping code */
- .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
- _text = .;
- *(.text.head)
- } :text = 0x9090
-
- /* The rest of the text */
.text : AT(ADDR(.text) - LOAD_OFFSET) {
+ _text = .;
+ /* bootstrapping code */
+ HEAD_TEXT
#ifdef CONFIG_X86_32
- /* not really needed, already page aligned */
. = ALIGN(PAGE_SIZE);
*(.text.page_aligned)
#endif