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 08/11] x86: use new macros for .data.init_task.
Date: Thu, 30 Apr 2009 20:01:35 -0400 [thread overview]
Message-ID: <1241136098-10376-9-git-send-email-tabbott@mit.edu> (raw)
In-Reply-To: <1241136098-10376-8-git-send-email-tabbott@mit.edu>
.data.init_task should not need a separate output section; this change
moves it into the .data section. This has the consequence of moving
the init_task data inside _edata, which I think should be OK.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Ingo Molnar <mingo@redhat.com>
---
arch/x86/kernel/init_task.c | 3 +--
arch/x86/kernel/vmlinux.lds.S | 13 ++++---------
2 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/arch/x86/kernel/init_task.c b/arch/x86/kernel/init_task.c
index df3bf26..e0383af 100644
--- a/arch/x86/kernel/init_task.c
+++ b/arch/x86/kernel/init_task.c
@@ -21,8 +21,7 @@ struct mm_struct init_mm = INIT_MM(init_mm);
* way process stacks are handled. This is done by having a special
* "init_task" linker map entry..
*/
-union thread_union init_thread_union
- __attribute__((__section__(".data.init_task"))) =
+union thread_union init_thread_union __init_task_data =
{ INIT_THREAD_INFO(init_task) };
/*
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index c7d54bf..6b8a633 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -102,6 +102,7 @@ SECTIONS
/* Data */
. = ALIGN(PAGE_SIZE);
.data : AT(ADDR(.data) - LOAD_OFFSET) {
+ INIT_TASK_DATA(THREAD_SIZE)
PAGE_ALIGNED_DATA
NOSAVE_DATA
#ifdef CONFIG_X86_32
@@ -205,15 +206,6 @@ SECTIONS
#endif /* CONFIG_X86_64 */
- /* init_task */
- . = ALIGN(THREAD_SIZE);
- .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
- *(.data.init_task)
- }
-#ifdef CONFIG_X86_64
- :data.init
-#endif
-
/*
* smp_locks might be freed after init
* start/end must be page aligned
@@ -225,6 +217,9 @@ SECTIONS
__smp_locks_end = .;
. = ALIGN(PAGE_SIZE);
}
+#ifdef CONFIG_X86_64
+ :data.init
+#endif
/* Init code and data - will be freed after init */
. = ALIGN(PAGE_SIZE);
--
1.6.2.1
next prev parent reply other threads:[~2009-05-01 0:12 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 ` [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 ` Tim Abbott [this message]
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-9-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®