From: Tim Abbott <tabbott@MIT.EDU>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Linux kernel mailing list <linux-kernel@vger.kernel.org>,
Anders Kaseorg <andersk@MIT.EDU>, Waseem Daher <wdaher@MIT.EDU>,
Denys Vlasenko <vda.linux@googlemail.com>,
Jeff Arnold <jbarnold@MIT.EDU>, Ingo Molnar <mingo@redhat.com>,
Thomas Gleixner <tglx@linutronix.de>,
"H. Peter Anvin" <hpa@zytor.com>, Tim Abbott <tabbott@MIT.EDU>,
Sam Ravnborg <sam@ravnborg.org>,
Linus Torvalds <torvalds@linux-foundation.org>
Subject: [PATCH 04/11] x86: convert compressed loader to use __HEAD and HEAD_TEXT macros.
Date: Thu, 30 Apr 2009 20:01:31 -0400 [thread overview]
Message-ID: <1241136098-10376-5-git-send-email-tabbott@mit.edu> (raw)
In-Reply-To: <1241136098-10376-4-git-send-email-tabbott@mit.edu>
This has the consequence of changing the section name use for head
code from ".text.head" to ".head.text".
Linus suggested that we merge the ".text.head" section with ".text"
(presumably while preserving the fact that the head code starts at 0).
When I tried this it caused the kernel to not boot.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
---
arch/x86/boot/compressed/head_32.S | 3 ++-
arch/x86/boot/compressed/head_64.S | 3 ++-
arch/x86/boot/compressed/vmlinux.lds.S | 6 ++++--
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index 85bd328..83df56f 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -23,13 +23,14 @@
*/
.text
+#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/segment.h>
#include <asm/page_types.h>
#include <asm/boot.h>
#include <asm/asm-offsets.h>
-.section ".text.head","ax",@progbits
+__HEAD
ENTRY(startup_32)
cld
/* test KEEP_SEGMENTS flag to see if the bootloader is asking
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index ed4a829..a788a91 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -24,6 +24,7 @@
.code32
.text
+#include <linux/init.h>
#include <linux/linkage.h>
#include <asm/segment.h>
#include <asm/pgtable_types.h>
@@ -33,7 +34,7 @@
#include <asm/processor-flags.h>
#include <asm/asm-offsets.h>
-.section ".text.head"
+__HEAD
.code32
ENTRY(startup_32)
cld
diff --git a/arch/x86/boot/compressed/vmlinux.lds.S b/arch/x86/boot/compressed/vmlinux.lds.S
index ffcb191..093fb4f 100644
--- a/arch/x86/boot/compressed/vmlinux.lds.S
+++ b/arch/x86/boot/compressed/vmlinux.lds.S
@@ -1,3 +1,5 @@
+#include <asm-generic/vmlinux.lds.h>
+
OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
#ifdef CONFIG_X86_64
@@ -14,9 +16,9 @@ SECTIONS
* address 0.
*/
. = 0;
- .text.head : {
+ .head.text : {
_head = . ;
- *(.text.head)
+ HEAD_TEXT
_ehead = . ;
}
.rodata.compressed : {
--
1.6.2.1
next prev parent reply other threads:[~2009-05-01 0:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-05-01 0:01 [PATCH 00/11] section name cleanup for x86 Tim Abbott
2009-05-01 0:01 ` [PATCH 01/11] x86: Use macros for .bss.page_aligned section Tim Abbott
2009-05-01 0:01 ` [PATCH 02/11] x86: Use section .data.page_aligned for the idt_table Tim Abbott
2009-05-01 0:01 ` [PATCH 03/11] x86: Use macros for .data.page_aligned Tim Abbott
2009-05-01 0:01 ` Tim Abbott [this message]
2009-05-01 0:01 ` [PATCH 05/11] x86: convert to use __HEAD and HEAD_TEXT macros Tim Abbott
2009-05-01 0:01 ` [PATCH 06/11] x86: use NOSAVE_DATA macro for .data.nosave section Tim Abbott
2009-05-01 0:01 ` [PATCH 07/11] x86: use new macro for .data.cacheline_aligned section Tim Abbott
2009-05-01 0:01 ` [PATCH 08/11] x86: use new macros for .data.init_task Tim Abbott
2009-05-01 0:01 ` [PATCH 09/11] x86: fix fragile computation of vsyscall address Tim Abbott
2009-05-01 0:01 ` [PATCH 10/11] x86: use new macro for .data.read_mostly section Tim Abbott
2009-05-01 0:01 ` [PATCH 11/11] x86: convert to new generic read_mostly support Tim Abbott
2009-05-06 16:19 ` [PATCH 03/11] x86: Use macros for .data.page_aligned H. Peter Anvin
2009-05-01 11:58 ` [PATCH 00/11] section name cleanup for x86 Ingo Molnar
2009-05-01 12:07 ` Sam Ravnborg
2009-05-01 15:34 ` Ingo Molnar
2009-05-01 16:31 ` H. Peter Anvin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1241136098-10376-5-git-send-email-tabbott@mit.edu \
--to=tabbott@mit.edu \
--cc=andersk@MIT.EDU \
--cc=hpa@zytor.com \
--cc=jbarnold@MIT.EDU \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
--cc=vda.linux@googlemail.com \
--cc=wdaher@MIT.EDU \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®