summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Abbott <tabbott@ksplice.com>2009-09-11 10:28:43 +0200
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2009-09-11 10:29:47 +0200
commit26803144666bd2155a19392fa58a7d512d9c0962 (patch)
tree983681436c30200e0d1cb34d8f4a3a4ee03ae906
parenta8c3cb4955d1a051732ead9ecf8bcffc8e7c039d (diff)
downloadlinux-3.10-26803144666bd2155a19392fa58a7d512d9c0962.tar.gz
linux-3.10-26803144666bd2155a19392fa58a7d512d9c0962.tar.bz2
linux-3.10-26803144666bd2155a19392fa58a7d512d9c0962.zip
[S390] Use macros for .data.page_aligned.
.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. Remove the reference to .data.idt, since nothing is put into the .data.idt section on the s390 architecture. It looks like Cyrill Gorcunov posted a patch to remove the .data.idt code on s390 previously: <http://lkml.indiana.edu/hypermail/linux/kernel/0802.2/2536.html> CCing him and the people who acked that patch in case there's a reason it wasn't applied. Signed-off-by: Tim Abbott <tabbott@ksplice.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Acked-by: Cyrill Gorcunov <gorcunov@openvz.org> Cc: Sam Ravnborg <sam@ravnborg.org> Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
-rw-r--r--arch/s390/kernel/vmlinux.lds.S6
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S
index a53db23ee09..8e023c8c246 100644
--- a/arch/s390/kernel/vmlinux.lds.S
+++ b/arch/s390/kernel/vmlinux.lds.S
@@ -60,6 +60,7 @@ SECTIONS
} :data
.data : { /* Data */
+ PAGE_ALIGNED_DATA(PAGE_SIZE)
DATA_DATA
CONSTRUCTORS
}
@@ -72,11 +73,6 @@ SECTIONS
. = ALIGN(PAGE_SIZE);
__nosave_end = .;
- . = ALIGN(PAGE_SIZE);
- .data.page_aligned : {
- *(.data.idt)
- }
-
. = ALIGN(0x100);
.data.cacheline_aligned : {
*(.data.cacheline_aligned)