From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756319Ab0IPVwr (ORCPT ); Thu, 16 Sep 2010 17:52:47 -0400 Received: from chilli.pcug.org.au ([203.10.76.44]:35250 "EHLO smtps.tip.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754843Ab0IPVwq (ORCPT ); Thu, 16 Sep 2010 17:52:46 -0400 Date: Fri, 17 Sep 2010 07:52:42 +1000 From: Stephen Rothwell To: Daniel Walker Cc: Sundar R IYER , Linus WALLEIJ , Russell King , linux-next@vger.kernel.org, LKML Subject: Re: FW: next build fails Message-Id: <20100917075242.e0bc4b54.sfr@canb.auug.org.au> In-Reply-To: <1284656407.2411.5.camel@c-dwalke-linux.qualcomm.com> References: <33A307AF30D7BF4F811B1568FE7A9B18043784FF99@EXDCVYMBSTM006.EQ1STM.local> <20100916164442.df749cc1.sfr@canb.auug.org.au> <1284656407.2411.5.camel@c-dwalke-linux.qualcomm.com> X-Mailer: Sylpheed 3.0.2 (GTK+ 2.20.1; i486-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Daniel, On Thu, 16 Sep 2010 10:00:07 -0700 Daniel Walker wrote: > > __v7_ca9mp_proc_info should just duplicate __v7_proc_info (the one below > it) .. Do you mean this: From: Stephen Rothwell Date: Fri, 17 Sep 2010 07:48:25 +1000 Subject: [PATCH] ARM: fix build failure for legacy PMD_FLAGS [Updated with advice from Daniel Walker : sfr] Acked-by: Linus Walleij Signed-off-by: Sundar Iyer Signed-off-by: Stephen Rothwell --- arch/arm/mm/proc-v7.S | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 820f6ba..fc8828b 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -334,10 +334,16 @@ cpu_elf_name: __v7_ca9mp_proc_info: .long 0x410fc090 @ Required ID value .long 0xff0ffff0 @ Mask for ID - .long PMD_TYPE_SECT | \ + ALT_SMP(.long \ + PMD_TYPE_SECT | \ PMD_SECT_AP_WRITE | \ PMD_SECT_AP_READ | \ - PMD_FLAGS + PMD_FLAGS_SMP) + ALT_UP(.long \ + PMD_TYPE_SECT | \ + PMD_SECT_AP_WRITE | \ + PMD_SECT_AP_READ | \ + PMD_FLAGS_UP) .long PMD_TYPE_SECT | \ PMD_SECT_XN | \ PMD_SECT_AP_WRITE | \ -- 1.7.1 -- Cheers, Stephen Rothwell sfr@canb.auug.org.au http://www.canb.auug.org.au/~sfr/