From 314354586d432c378ea579e5451dc89a77b6d252 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Fri, 11 Sep 2009 10:28:43 +0200
Subject: [PATCH] --- yaml --- r: 157456 b: refs/heads/master c:
 26803144666bd2155a19392fa58a7d512d9c0962 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/arch/s390/kernel/vmlinux.lds.S | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ffaa3f9b219e..a64f54c5d789 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a8c3cb4955d1a051732ead9ecf8bcffc8e7c039d
+refs/heads/master: 26803144666bd2155a19392fa58a7d512d9c0962
diff --git a/trunk/arch/s390/kernel/vmlinux.lds.S b/trunk/arch/s390/kernel/vmlinux.lds.S
index a53db23ee092..8e023c8c2461 100644
--- a/trunk/arch/s390/kernel/vmlinux.lds.S
+++ b/trunk/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)