From: Tim Abbott <tabbott@MIT.EDU>
To: Sam Ravnborg <sam@ravnborg.org>
Cc: Denys Vlasenko <vda.linux@googlemail.com>,
Jeff Arnold <jbarnold@mit.edu>,
Linux kernel mailing list <linux-kernel@vger.kernel.org>,
Anders Kaseorg <andersk@mit.edu>,
linuxppc-dev@ozlabs.org, Paul Mackerras <paulus@samba.org>,
Tim Abbott <tabbott@mit.edu>, Waseem Daher <wdaher@mit.edu>
Subject: [PATCH 3/8] powerpc: Use macros for .data.page_aligned section.
Date: Thu, 30 Apr 2009 19:56:12 -0400 [thread overview]
Message-ID: <1241135777-9462-4-git-send-email-tabbott@mit.edu> (raw)
In-Reply-To: <1241135777-9462-3-git-send-email-tabbott@mit.edu>
.data.page_aligned should not need a separate output section, so as
part of this cleanup I moved into the .data output section in the
linker scripts in order to eliminate unnecessary references to the
section name.
Note that this change moves the page-aligned data inside _edata.
Since it _is_ data, I suspect having page-aligned data outside _edata
was a bug. Please comment if it is not.
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: linuxppc-dev@ozlabs.org
---
arch/powerpc/kernel/vdso.c | 3 ++-
arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 3 ++-
arch/powerpc/kernel/vdso64/vdso64_wrapper.S | 3 ++-
arch/powerpc/kernel/vmlinux.lds.S | 6 +-----
4 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/arch/powerpc/kernel/vdso.c b/arch/powerpc/kernel/vdso.c
index ad06d5c..f075591 100644
--- a/arch/powerpc/kernel/vdso.c
+++ b/arch/powerpc/kernel/vdso.c
@@ -1,3 +1,4 @@
+
/*
* Copyright (C) 2004 Benjamin Herrenschmidt, IBM Corp.
* <benh@kernel.crashing.org>
@@ -74,7 +75,7 @@ static int vdso_ready;
static union {
struct vdso_data data;
u8 page[PAGE_SIZE];
-} vdso_data_store __attribute__((__section__(".data.page_aligned")));
+} vdso_data_store __page_aligned_data;
struct vdso_data *vdso_data = &vdso_data_store.data;
/* Format of the patch table */
diff --git a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
index 556f0ca..6e8f507 100644
--- a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
+++ b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S
@@ -1,7 +1,8 @@
#include <linux/init.h>
+#include <linux/linkage.h>
#include <asm/page.h>
- .section ".data.page_aligned"
+ __PAGE_ALIGNED_DATA
.globl vdso32_start, vdso32_end
.balign PAGE_SIZE
diff --git a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
index 0529cb9..b8553d6 100644
--- a/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
+++ b/arch/powerpc/kernel/vdso64/vdso64_wrapper.S
@@ -1,7 +1,8 @@
#include <linux/init.h>
+#include <linux/linkage.h>
#include <asm/page.h>
- .section ".data.page_aligned"
+ __PAGE_ALIGNED_DATA
.globl vdso64_start, vdso64_end
.balign PAGE_SIZE
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 47899b0..d3dcea0 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -221,6 +221,7 @@ SECTIONS
_sdata = .;
.data : AT(ADDR(.data) - LOAD_OFFSET) {
+ PAGE_ALIGNED_DATA
DATA_DATA
#ifdef CONFIG_PPC32
*(.sdata)
@@ -258,11 +259,6 @@ SECTIONS
*(.data.init_task)
}
- . = ALIGN(PAGE_SIZE);
- .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) {
- *(.data.page_aligned)
- }
-
.data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) {
*(.data.cacheline_aligned)
}
--
1.6.2.1
next prev parent reply other threads:[~2009-05-01 0:08 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-30 23:56 [PATCH 0/8] section name cleanup for powerpc Tim Abbott
2009-04-30 23:56 ` [PATCH 1/8] powerpc: Remove unused __page_aligned macro Tim Abbott
2009-04-30 23:56 ` [PATCH 2/8] powerpc: share .data output section definition between 32 and 64 bits Tim Abbott
2009-04-30 23:56 ` Tim Abbott [this message]
2009-04-30 23:56 ` [PATCH 4/8] powerpc: use NOSAVE_DATA macro for .data.nosave section Tim Abbott
2009-04-30 23:56 ` [PATCH 5/8] powerpc: use new macro for .data.cacheline_aligned section Tim Abbott
2009-04-30 23:56 ` [PATCH 6/8] powerpc: use new macros for .data.init_task Tim Abbott
2009-04-30 23:56 ` [PATCH 7/8] powerpc: use new macro for .data.read_mostly section Tim Abbott
2009-04-30 23:56 ` [PATCH 8/8] powerpc: convert to new generic read_mostly support Tim Abbott
2009-05-18 4:23 ` [PATCH 5/8] powerpc: use new macro for .data.cacheline_aligned section Benjamin Herrenschmidt
2009-05-01 1:46 ` [PATCH 2/8] powerpc: share .data output section definition between 32 and 64 bits Michael Ellerman
2009-05-01 1:56 ` Tim Abbott
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=1241135777-9462-4-git-send-email-tabbott@mit.edu \
--to=tabbott@mit.edu \
--cc=andersk@mit.edu \
--cc=jbarnold@mit.edu \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@ozlabs.org \
--cc=paulus@samba.org \
--cc=sam@ravnborg.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;
as well as URLs for NNTP newsgroup(s).