From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from biscayne-one-station.mit.edu (BISCAYNE-ONE-STATION.MIT.EDU [18.7.7.80]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C74EADF973 for ; Fri, 1 May 2009 10:06:40 +1000 (EST) From: Tim Abbott To: Sam Ravnborg Subject: [PATCH 5/8] powerpc: use new macro for .data.cacheline_aligned section. Date: Thu, 30 Apr 2009 19:56:14 -0400 Message-Id: <1241135777-9462-6-git-send-email-tabbott@mit.edu> In-Reply-To: <1241135777-9462-5-git-send-email-tabbott@mit.edu> References: <1241135777-9462-1-git-send-email-tabbott@mit.edu> <1241135777-9462-2-git-send-email-tabbott@mit.edu> <1241135777-9462-3-git-send-email-tabbott@mit.edu> <1241135777-9462-4-git-send-email-tabbott@mit.edu> <1241135777-9462-5-git-send-email-tabbott@mit.edu> Cc: Denys Vlasenko , Jeff Arnold , Linux kernel mailing list , Anders Kaseorg , linuxppc-dev@ozlabs.org, Paul Mackerras , Tim Abbott , Waseem Daher List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , .data.cacheline_aligned should not need a separate output section; this change moves it into the .data section. Since there isn't an ALIGN() directive before the .data.cacheline_aligned scetion in the current linker script, I'd like an ack from one of the powerpc maintainers that L1_CACHE_BYTES is the correct alignment here. Signed-off-by: Tim Abbott Cc: Benjamin Herrenschmidt Cc: Paul Mackerras Cc: linuxppc-dev@ozlabs.org --- arch/powerpc/kernel/vmlinux.lds.S | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 4223892..e769717 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S @@ -223,6 +223,7 @@ SECTIONS .data : AT(ADDR(.data) - LOAD_OFFSET) { PAGE_ALIGNED_DATA NOSAVE_DATA + CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES) DATA_DATA #ifdef CONFIG_PPC32 *(.sdata) @@ -260,10 +261,6 @@ SECTIONS *(.data.init_task) } - .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { - *(.data.cacheline_aligned) - } - . = ALIGN(L1_CACHE_BYTES); .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET) { *(.data.read_mostly) -- 1.6.2.1