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>
Subject: [PATCH 06/11] x86: use NOSAVE_DATA macro for .data.nosave section.
Date: Thu, 30 Apr 2009 20:01:33 -0400 [thread overview]
Message-ID: <1241136098-10376-7-git-send-email-tabbott@mit.edu> (raw)
In-Reply-To: <1241136098-10376-6-git-send-email-tabbott@mit.edu>
.data.nosave should not need a separate output section; this change
moves it into the .data section.
On x86_64, this has the consequence of moving .data.nosave inside
_edata, which I think should be harmless.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Ingo Molnar <mingo@redhat.com>
---
arch/x86/kernel/vmlinux.lds.S | 29 ++++++-----------------------
1 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index 791afa7..88b059b 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -103,6 +103,7 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
.data : AT(ADDR(.data) - LOAD_OFFSET) {
PAGE_ALIGNED_DATA
+ NOSAVE_DATA
DATA_DATA
CONSTRUCTORS
@@ -113,17 +114,6 @@ SECTIONS
} :data
#ifdef CONFIG_X86_32
- /* 32 bit has nosave before _edata */
- . = ALIGN(PAGE_SIZE);
- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
- __nosave_begin = .;
- *(.data.nosave)
- . = ALIGN(PAGE_SIZE);
- __nosave_end = .;
- }
-#endif
-
-#ifdef CONFIG_X86_32
. = ALIGN(32);
#else
. = ALIGN(PAGE_SIZE);
@@ -323,7 +313,7 @@ SECTIONS
#if defined(CONFIG_X86_64) && defined(CONFIG_SMP)
/*
* percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the
- * output PHDR, so the next output section - __data_nosave - should
+ * output PHDR, so the next output section - .bss - should
* start another section data.init2. Also, pda should be at the head of
* percpu area. Preallocate it and define the percpu offset symbol
* so that it can be accessed as a percpu variable.
@@ -341,17 +331,6 @@ SECTIONS
__init_end = .;
}
-#ifdef CONFIG_X86_64
- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) {
- . = ALIGN(PAGE_SIZE);
- __nosave_begin = .;
- *(.data.nosave)
- . = ALIGN(PAGE_SIZE);
- __nosave_end = .;
- } :data.init2
- /* use another section data.init2, see PERCPU_VADDR() above */
-#endif
-
/* BSS */
. = ALIGN(PAGE_SIZE);
.bss : AT(ADDR(.bss) - LOAD_OFFSET) {
@@ -361,6 +340,10 @@ SECTIONS
. = ALIGN(4);
__bss_stop = .;
}
+#ifdef CONFIG_X86_64
+ :data.init2
+#endif
+ /* use another section data.init2, see PERCPU_VADDR() above */
. = ALIGN(PAGE_SIZE);
.brk : AT(ADDR(.brk) - LOAD_OFFSET) {
--
1.6.2.1
next prev parent reply other threads:[~2009-05-01 0:13 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 ` [PATCH 04/11] x86: convert compressed loader to use __HEAD and HEAD_TEXT macros Tim Abbott
2009-05-01 0:01 ` [PATCH 05/11] x86: convert " Tim Abbott
2009-05-01 0:01 ` Tim Abbott [this message]
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-7-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=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®