diff mbox

[5/7] sh: use new macros for .data.init_task.

Message ID 1241135883-9766-6-git-send-email-tabbott@mit.edu (mailing list archive)
State Accepted
Delegated to: Paul Mundt
Headers show

Commit Message

Tim Abbott April 30, 2009, 11:58 p.m. UTC 
Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: linux-sh@vger.kernel.org
---
 arch/sh/kernel/init_task.c      |    3 +--
 arch/sh/kernel/vmlinux_32.lds.S |    3 +--
 arch/sh/kernel/vmlinux_64.lds.S |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/arch/sh/kernel/init_task.c b/arch/sh/kernel/init_task.c
index 80c35ff..9522d9a 100644
--- a/arch/sh/kernel/init_task.c
+++ b/arch/sh/kernel/init_task.c
@@ -20,8 +20,7 @@  EXPORT_SYMBOL(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/sh/kernel/vmlinux_32.lds.S b/arch/sh/kernel/vmlinux_32.lds.S
index eabb0bb..7a0f3c4 100644
--- a/arch/sh/kernel/vmlinux_32.lds.S
+++ b/arch/sh/kernel/vmlinux_32.lds.S
@@ -59,9 +59,8 @@  SECTIONS
 	.uncached.data : { *(.uncached.data) }
 	__uncached_end = .;
 
-	. = ALIGN(THREAD_SIZE);
 	.data : {			/* Data */
-		*(.data.init_task)
+		INIT_TASK_DATA(THREAD_SIZE)
 
 		. = ALIGN(L1_CACHE_BYTES);
 		*(.data.read_mostly)
diff --git a/arch/sh/kernel/vmlinux_64.lds.S b/arch/sh/kernel/vmlinux_64.lds.S
index e0e2e1b..5cd3e78 100644
--- a/arch/sh/kernel/vmlinux_64.lds.S
+++ b/arch/sh/kernel/vmlinux_64.lds.S
@@ -68,9 +68,8 @@  SECTIONS
 	NOTES 
 	RO_DATA(PAGE_SIZE)
 
-	. = ALIGN(THREAD_SIZE);
 	.data : C_PHYS(.data) {			/* Data */
-		*(.data.init_task)
+		INIT_TASK_DATA(THREAD_SIZE)
 
 		. = ALIGN(L1_CACHE_BYTES);
 		*(.data.read_mostly)