Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Thu, 30 Apr 2009
 17:00:01 -0700
Received: from psmtp.com ([64.18.0.110]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Thu, 30 Apr 2009 17:00:00 -0700
Received: from source ([213.58.128.207]) by exprod5mx286.postini.com
 ([64.18.4.13]) with SMTP;	Thu, 30 Apr 2009 17:00:00 PDT
Received: from localhost.localdomain ([127.0.0.1]:58562 "EHLO
	ftp.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S20023714AbZD3X75 (ORCPT	<rfc822;andy.sharp@onstor.com>); Fri, 1 May
 2009 00:59:57 +0100
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	<rfc822;linux-mips@linux-mips.org>);
 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 <tabbott@MIT.EDU>
To: Sam Ravnborg <sam@ravnborg.org>
CC: Linux kernel mailing list <linux-kernel@vger.kernel.org>, Anders Kaseorg
	<andersk@mit.edu>, Waseem Daher <wdaher@mit.edu>, Denys Vlasenko
	<vda.linux@googlemail.com>, Jeff Arnold <jbarnold@mit.edu>, Ralf Baechle
	<ralf@linux-mips.org>, "linux-mips@linux-mips.org"
	<linux-mips@linux-mips.org>, Tim Abbott <tabbott@mit.edu>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 30 Apr 2009 16:53:28 -0700
Subject: [PATCH 2/4] mips: use new macro for .data.cacheline_aligned section.
Thread-Topic: [PATCH 2/4] mips: use new macro for .data.cacheline_aligned
 section.
Thread-Index: AcnJ78YVvrygbdCOQcarKGa2Xr3LKQ==
Message-ID: <1241135610-9012-3-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>
In-Reply-To: <1241135610-9012-2-git-send-email-tabbott@mit.edu>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 01 May 2009 00:00:00.0780 (UTC)
 FILETIME=[C5B044C0:01C9C9EF]
x-ems-stamp: FCDPVMoEen5mw5yJK7CeSA==
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-scanned-by: MIMEDefang 2.42
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-neptune: 0/0/0.00/0
x-pstn-levels: (S:99.90000/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-list: linux-mips
x-archive-position: 22580
x-ecartis-version: Ecartis v1.0.0
x-original-sender: tabbott@MIT.EDU
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

.data.cacheline_aligned should not need a separate output section;
this change moves it into the .data section.

Signed-off-by: Tim Abbott <tabbott@mit.edu>
Cc: Ralf Baechle <ralf@linux-mips.org>
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
 		. =3D 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)
 	}
-
-	. =3D ALIGN(1 << CONFIG_MIPS_L1_CACHE_SHIFT);
-	.data.cacheline_aligned : {
-		*(.data.cacheline_aligned)
-	}
 	_edata =3D  .;			/* End of data section */
=20
 	/* will be freed after init */
--=20
1.6.2.1


