Received: with ECARTIS (v1.0.0; list linux-mips); Fri, 01 May 2009 00:59:40 +0100 (BST) Received: from BISCAYNE-ONE-STATION.MIT.EDU ([18.7.7.80]:61118 "EHLO biscayne-one-station.mit.edu" rhost-flags-OK-OK-OK-OK) by ftp.linux-mips.org with ESMTP id S20026857AbZD3X7e (ORCPT ); Fri, 1 May 2009 00:59:34 +0100 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 n3UNrX7m016907; Thu, 30 Apr 2009 19:53:34 -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 n3UNrW7u011401; Thu, 30 Apr 2009 19:53:33 -0400 (EDT) From: Tim Abbott To: Sam Ravnborg Cc: Linux kernel mailing list , Anders Kaseorg , Waseem Daher , Denys Vlasenko , Jeff Arnold , Ralf Baechle , linux-mips@linux-mips.org, Tim Abbott Subject: [PATCH 2/4] mips: use new macro for .data.cacheline_aligned section. Date: Thu, 30 Apr 2009 19:53:28 -0400 Message-Id: <1241135610-9012-3-git-send-email-tabbott@mit.edu> X-Mailer: git-send-email 1.6.2.1 In-Reply-To: <1241135610-9012-2-git-send-email-tabbott@mit.edu> References: <1241135610-9012-1-git-send-email-tabbott@mit.edu> <1241135610-9012-2-git-send-email-tabbott@mit.edu> X-Scanned-By: MIMEDefang 2.42 Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 22580 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: tabbott@MIT.EDU Precedence: bulk X-list: linux-mips .data.cacheline_aligned should not need a separate output section; this change moves it into the .data section. Signed-off-by: Tim Abbott Cc: Ralf Baechle Cc: linux-mips@linux-mips.org --- arch/mips/kernel/vmlinux.lds.S | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 2a6a995..ba459cb 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S @@ -79,6 +79,7 @@ SECTIONS . = ALIGN(_PAGE_SIZE); *(.data.init_task) NOSAVE_DATA + CACHELINE_ALIGNED_DATA(1 << CONFIG_MIPS_L1_CACHE_SHIFT) DATA_DATA CONSTRUCTORS } @@ -95,11 +96,6 @@ SECTIONS .sdata : { *(.sdata) } - - . = ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT); - .data.cacheline_aligned : { - *(.data.cacheline_aligned) - } _edata = .; /* End of data section */ /* will be freed after init */ -- 1.6.2.1