From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sundar R IYER <sundar.iyer@stericsson•com>
Cc: Linus WALLEIJ <linus.walleij@stericsson•com>,
Daniel Walker <dwalker@fifo99•com>,
Russell King <rmk@arm•linux.org.uk>,
linux-next@vger•kernel.org, LKML <linux-kernel@vger•kernel.org>
Subject: Re: FW: next build fails
Date: Thu, 16 Sep 2010 16:44:42 +1000 [thread overview]
Message-ID: <20100916164442.df749cc1.sfr@canb.auug.org.au> (raw)
In-Reply-To: <33A307AF30D7BF4F811B1568FE7A9B18043784FF99@EXDCVYMBSTM006.EQ1STM.local>
[-- Attachment #1: Type: text/plain, Size: 1869 bytes --]
Hi,
On Thu, 16 Sep 2010 07:44:54 +0200 Sundar R IYER <sundar.iyer@stericsson•com> wrote:
>
> I am getting this build failure for our u8500_defconfig. I think some
> patch hasn't got completely merged. I patched it up at my end,
> but would like to know if this is valid.
>
> ----------------------------------------------------------------
> commit 3ee465868d599f83d4851f9b86727071c55fd726
> Author: Sundar Iyer <sundar.iyer@stericsson•com>
> Date: Wed Sep 15 12:27:10 2010 +0530
>
> ARM: fix build failure for legacy PMD_FLAGS
>
> Acked-by: Linus Walleij <linus.walleij@stericsson•com>
> Signed-off-by: Sundar Iyer <sundar.iyer@stericsson•com>
>
> diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index 820f6ba..f3cc9f6 100644
> --- a/arch/arm/mm/proc-v7.S
> +++ b/arch/arm/mm/proc-v7.S
> @@ -337,7 +337,7 @@ __v7_ca9mp_proc_info:
> .long PMD_TYPE_SECT | \
> PMD_SECT_AP_WRITE | \
> PMD_SECT_AP_READ | \
> - PMD_FLAGS
> + PMD_FLAGS_UP
> .long PMD_TYPE_SECT | \
> PMD_SECT_XN | \
> PMD_SECT_AP_WRITE | \
>
This is due to a mismerge (in linux-next) between commit
dc966984f44f16b8bb6b0644e501c7c2163ead69 ("ARM: Allow SMP kernels to boot
on UP systems") from the arm tree (which renamed PMD_FLAGS to
PMD_FLAGS_UP) and commit b7bc5d9c6556e3ca37176784036380f91b53432c ("arm:
mm: add proc info for ARM11MPCore/Cortex-A9 from ARM") from the msm tree
(which added a new use of PMD_FLAGS).
I will add the above patch as a merge fixup to my tree until the msm tree
gets merged into the arm tree (or vice versa or they both are merged into
Linus' tree).
Thanks for the heads up.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 490 bytes --]
next parent reply other threads:[~2010-09-16 6:44 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <33A307AF30D7BF4F811B1568FE7A9B18043784FF99@EXDCVYMBSTM006.EQ1STM.local>
2010-09-16 6:44 ` Stephen Rothwell [this message]
2010-09-16 17:00 ` FW: next build fails Daniel Walker
2010-09-16 21:52 ` Stephen Rothwell
2010-09-16 21:58 ` Daniel Walker
2010-09-16 22:04 ` Stephen Rothwell
2010-09-16 22:08 ` Daniel Walker
2010-09-17 10:35 ` Russell King
2010-09-17 15:44 ` Daniel Walker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100916164442.df749cc1.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dwalker@fifo99$(echo .)com \
--cc=linus.walleij@stericsson$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rmk@arm$(echo .)linux.org.uk \
--cc=sundar.iyer@stericsson$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox