From patchwork Thu Apr 30 23:58:51 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tim Abbott X-Patchwork-Id: 26733 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 494F5B7082 for ; Fri, 1 May 2009 10:22:45 +1000 (EST) Received: by ozlabs.org (Postfix) id 035334FCEC; Fri, 1 May 2009 10:03:55 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 7DC944F4D8 for ; Fri, 1 May 2009 10:03:54 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765437AbZEAADg (ORCPT ); Thu, 30 Apr 2009 20:03:36 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758346AbZEAADg (ORCPT ); Thu, 30 Apr 2009 20:03:36 -0400 Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:61966 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1765426AbZEAADe (ORCPT ); Thu, 30 Apr 2009 20:03:34 -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 n4100dC2019893; Thu, 30 Apr 2009 20:01:05 -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 n3UNwt7J012235; Thu, 30 Apr 2009 19:58:56 -0400 (EDT) From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , "David S. Miller" , sparclinux@vger.kernel.org, Tim Abbott Subject: [PATCH 2/4] sparc: use new macros for .data.init_task. Date: Thu, 30 Apr 2009 19:58:51 -0400 Message-Id: <1241135933-9913-3-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241135933-9913-2-git-send-email-tabbott@mit.edu> References: <1241135933-9913-1-git-send-email-tabbott@mit.edu> <1241135933-9913-2-git-send-email-tabbott@mit.edu> X-Scanned-By: MIMEDefang 2.42 X-Spam-Flag: NO X-Spam-Score: 0.00 Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@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: David S. Miller Cc: sparclinux@vger.kernel.org --- arch/sparc/kernel/init_task.c | 5 ++--- arch/sparc/kernel/vmlinux.lds.S | 6 +----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/arch/sparc/kernel/init_task.c b/arch/sparc/kernel/init_task.c index f28cb82..7367984 100644 --- a/arch/sparc/kernel/init_task.c +++ b/arch/sparc/kernel/init_task.c @@ -21,6 +21,5 @@ EXPORT_SYMBOL(init_task); * If this is not aligned on a 8k boundry, then you should change code * in etrap.S which assumes it. */ -union thread_union init_thread_union - __attribute__((section (".data.init_task"))) - = { INIT_THREAD_INFO(init_task) }; +union thread_union init_thread_union __init_task_data = + { INIT_THREAD_INFO(init_task) }; diff --git a/arch/sparc/kernel/vmlinux.lds.S b/arch/sparc/kernel/vmlinux.lds.S index 6587e03..3fbf650 100644 --- a/arch/sparc/kernel/vmlinux.lds.S +++ b/arch/sparc/kernel/vmlinux.lds.S @@ -52,6 +52,7 @@ SECTIONS RO_DATA(PAGE_SIZE) .data : { + INIT_TASK_DATA(THREAD_SIZE) CACHELINE_ALIGNED_DATA(SMP_CACHE_BYTES) DATA_DATA CONSTRUCTORS @@ -66,11 +67,6 @@ SECTIONS /* End of data section */ _edata = .; - /* init_task */ - . = ALIGN(THREAD_SIZE); - .data.init_task : { - *(.data.init_task) - } .fixup : { __start___fixup = .; *(.fixup)