Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757197AbZD3Xpl (ORCPT ); Thu, 30 Apr 2009 19:45:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758871AbZD3Xom (ORCPT ); Thu, 30 Apr 2009 19:44:42 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:58963 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758645AbZD3Xol (ORCPT ); Thu, 30 Apr 2009 19:44:41 -0400 From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , Mikael Starvik , Jesper Nilsson , dev-etrax@axis.com, Tim Abbott Subject: [PATCH] cris: use new macros for .data.init_task. Date: Thu, 30 Apr 2009 19:44:37 -0400 Message-Id: <1241135077-8001-2-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241135077-8001-1-git-send-email-tabbott@mit.edu> References: <1241135077-8001-1-git-send-email-tabbott@mit.edu> X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1743 Lines: 54 .data.init_task should not need a separate output section; this change moves it into the .data section. Signed-off-by: Tim Abbott Cc: Mikael Starvik Cc: Jesper Nilsson Cc: dev-etrax@axis.com --- arch/cris/kernel/process.c | 3 +-- arch/cris/kernel/vmlinux.lds.S | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/cris/kernel/process.c b/arch/cris/kernel/process.c index 4df0b32..7a270c6 100644 --- a/arch/cris/kernel/process.c +++ b/arch/cris/kernel/process.c @@ -49,8 +49,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/cris/kernel/vmlinux.lds.S b/arch/cris/kernel/vmlinux.lds.S index 0d2adfc..e4f7490 100644 --- a/arch/cris/kernel/vmlinux.lds.S +++ b/arch/cris/kernel/vmlinux.lds.S @@ -62,14 +62,12 @@ SECTIONS ___data_start = . ; __Sdata = . ; .data : { /* Data */ + INIT_TASK_DATA(PAGE_SIZE) DATA_DATA } __edata = . ; /* End of data section. */ _edata = . ; - . = ALIGN(PAGE_SIZE); /* init_task and stack, must be aligned. */ - .data.init_task : { *(.data.init_task) } - . = ALIGN(PAGE_SIZE); /* Init code and data. */ __init_begin = .; .init.text : { -- 1.6.2.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/