From e88b61191bbb1833c5d17e054a6bfc5d927f1473 Mon Sep 17 00:00:00 2001
From: Tim Abbott <tabbott@ksplice.com>
Date: Sun, 18 Oct 2009 13:23:55 -0400
Subject: [PATCH] --- yaml --- r: 173537 b: refs/heads/master c:
 53749f735a5b79156b56e75ee379be9e299b5e4b h: refs/heads/master i:   173535:
 87408fa6dac6760d81787395c4ad1666615dbae5 v: v3

---
 [refs]                                    |  2 +-
 trunk/arch/m68knommu/kernel/vmlinux.lds.S | 17 ++++-------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index d4cdf9a98e76..bd0893b4b1ff 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 995bcd3dc1924095ddda45d0f8ece6bf6124d74e
+refs/heads/master: 53749f735a5b79156b56e75ee379be9e299b5e4b
diff --git a/trunk/arch/m68knommu/kernel/vmlinux.lds.S b/trunk/arch/m68knommu/kernel/vmlinux.lds.S
index 884924982dd9..9f1784f586b9 100644
--- a/trunk/arch/m68knommu/kernel/vmlinux.lds.S
+++ b/trunk/arch/m68knommu/kernel/vmlinux.lds.S
@@ -154,22 +154,13 @@ SECTIONS {
 		_edata = . ;
 	} > DATA
 
-	.init : {
+	.init.text : {
 		. = ALIGN(PAGE_SIZE);
 		__init_begin = .;
 	} > INIT
-	.init : {
-		_sinittext = .;
-		INIT_TEXT
-		_einittext = .;
-		INIT_DATA
-		INIT_SETUP(16)
-		INIT_CALLS
-		CON_INITCALL
-		SECURITY_INITCALL
-		INIT_RAM_FS
-	} > INIT
-	.init : {
+	INIT_TEXT_SECTION(PAGE_SIZE) > INIT
+	INIT_DATA_SECTION(16) > INIT
+	.init.data : {
 		. = ALIGN(PAGE_SIZE);
 		__init_end = .;
 	} > INIT