Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765525AbZEAAGK (ORCPT ); Thu, 30 Apr 2009 20:06:10 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1764942AbZD3X7o (ORCPT ); Thu, 30 Apr 2009 19:59:44 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:61124 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764862AbZD3X7n (ORCPT ); Thu, 30 Apr 2009 19:59:43 -0400 From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , David Howells , Tim Abbott Subject: [PATCH 5/6] mn10300: use new macros for .data.init_task. Date: Thu, 30 Apr 2009 19:54:20 -0400 Message-Id: <1241135661-9147-6-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241135661-9147-5-git-send-email-tabbott@mit.edu> References: <1241135661-9147-1-git-send-email-tabbott@mit.edu> <1241135661-9147-2-git-send-email-tabbott@mit.edu> <1241135661-9147-3-git-send-email-tabbott@mit.edu> <1241135661-9147-4-git-send-email-tabbott@mit.edu> <1241135661-9147-5-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: 1750 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: David Howells --- arch/mn10300/kernel/init_task.c | 3 +-- arch/mn10300/kernel/vmlinux.lds.S | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/arch/mn10300/kernel/init_task.c b/arch/mn10300/kernel/init_task.c index 5ac3566..7a89fc3 100644 --- a/arch/mn10300/kernel/init_task.c +++ b/arch/mn10300/kernel/init_task.c @@ -30,8 +30,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/mn10300/kernel/vmlinux.lds.S b/arch/mn10300/kernel/vmlinux.lds.S index cb43406..4dc63e6 100644 --- a/arch/mn10300/kernel/vmlinux.lds.S +++ b/arch/mn10300/kernel/vmlinux.lds.S @@ -49,6 +49,7 @@ SECTIONS /* writeable */ .data : { /* Data */ + INIT_TASK_DATA(THREAD_SIZE) NOSAVE_DATA CACHELINE_ALIGNED_DATA(32) DATA_DATA @@ -62,9 +63,6 @@ SECTIONS _edata = .; /* End of data section */ } - . = ALIGN(THREAD_SIZE); /* init_task */ - .data.init_task : { *(.data.init_task) } - /* might get freed after init */ . = ALIGN(PAGE_SIZE); .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { -- 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/