From patchwork Thu Apr 30 23:55:17 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Abbott X-Patchwork-Id: 21310 X-Patchwork-Delegate: kyle@mcmartin.ca Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4101I2g017737 for ; Fri, 1 May 2009 00:01:19 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762269AbZD3X7x (ORCPT ); Thu, 30 Apr 2009 19:59:53 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757455AbZD3X7x (ORCPT ); Thu, 30 Apr 2009 19:59:53 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:61127 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1764897AbZD3X7v (ORCPT ); Thu, 30 Apr 2009 19:59:51 -0400 Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103]) by biscayne-one-station.mit.edu (8.13.6/8.9.2) with ESMTP id n3UNtNpT018188; Thu, 30 Apr 2009 19:55:23 -0400 (EDT) Received: from localhost (c-67-186-133-195.hsd1.ma.comcast.net [67.186.133.195]) (authenticated bits=0) (User authenticated as tabbott@ATHENA.MIT.EDU) by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id n3UNtMd2011670; Thu, 30 Apr 2009 19:55:22 -0400 (EDT) From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , Kyle McMartin , Helge Deller , linux-parisc@vger.kernel.org, Tim Abbott Subject: [PATCH 3/5] parisc: use new macros for .data.init_task. Date: Thu, 30 Apr 2009 19:55:17 -0400 Message-Id: <1241135719-9286-4-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241135719-9286-3-git-send-email-tabbott@mit.edu> References: <1241135719-9286-1-git-send-email-tabbott@mit.edu> <1241135719-9286-2-git-send-email-tabbott@mit.edu> <1241135719-9286-3-git-send-email-tabbott@mit.edu> X-Scanned-By: MIMEDefang 2.42 X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org .data.init_task should not need a separate output section; this change moves it into the .data section. Signed-off-by: Tim Abbott Cc: Kyle McMartin Cc: Helge Deller Cc: linux-parisc@vger.kernel.org --- arch/parisc/kernel/init_task.c | 2 +- arch/parisc/kernel/vmlinux.lds.S | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/arch/parisc/kernel/init_task.c b/arch/parisc/kernel/init_task.c index 1e25a45..8ee17ea 100644 --- a/arch/parisc/kernel/init_task.c +++ b/arch/parisc/kernel/init_task.c @@ -48,7 +48,7 @@ EXPORT_SYMBOL(init_mm); * "init_task" linker map entry.. */ union thread_union init_thread_union - __attribute__((aligned(128))) __attribute__((__section__(".data.init_task"))) = + __attribute__((aligned(128))) __init_task_data = { INIT_THREAD_INFO(init_task) }; #if PT_NLEVELS == 3 diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index b5936c9..c8a528d 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S @@ -103,6 +103,8 @@ SECTIONS . = ALIGN(L1_CACHE_BYTES); /* Data */ .data : { + /* assembler code expects init_task to be 16k aligned */ + INIT_TASK_DATA(16384) NOSAVE_DATA CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) DATA_DATA @@ -133,14 +135,6 @@ SECTIONS } __bss_stop = .; - - /* assembler code expects init_task to be 16k aligned */ - . = ALIGN(16384); - /* init_task */ - .data.init_task : { - *(.data.init_task) - } - #ifdef CONFIG_64BIT . = ALIGN(16); /* Linkage tables */