[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100917075242.e0bc4b54.sfr@canb.auug.org.au>
Date: Fri, 17 Sep 2010 07:52:42 +1000
From: Stephen Rothwell <sfr@...b.auug.org.au>
To: Daniel Walker <dwalker@...o99.com>
Cc: Sundar R IYER <sundar.iyer@...ricsson.com>,
Linus WALLEIJ <linus.walleij@...ricsson.com>,
Russell King <rmk@....linux.org.uk>,
linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: FW: next build fails
Hi Daniel,
On Thu, 16 Sep 2010 10:00:07 -0700 Daniel Walker <dwalker@...o99.com> wrote:
>
> __v7_ca9mp_proc_info should just duplicate __v7_proc_info (the one below
> it) ..
Do you mean this:
From: Stephen Rothwell <sfr@...b.auug.org.au>
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 <dwalker@...o99.com>: sfr]
Acked-by: Linus Walleij <linus.walleij@...ricsson.com>
Signed-off-by: Sundar Iyer <sundar.iyer@...ricsson.com>
Signed-off-by: Stephen Rothwell <sfr@...b.auug.org.au>
---
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@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists