Subject: Re: FW: next build fails

From: Stephen Rothwell <[email-masked]>
Date: Fri, 17 Sep 2010 07:52:42 +1000

Hi Daniel,

On Thu, 16 Sep 2010 10:00:07 -0700 Daniel Walker <[email-masked]> wrote:
>
> __v7_ca9mp_proc_info should just duplicate __v7_proc_info (the one below
> it) ..

Do you mean this:

From: Stephen Rothwell <[email-masked]>
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 <[email-masked]>: sfr]

Acked-by: Linus Walleij <[email-masked]>
Signed-off-by: Sundar Iyer <[email-masked]>
Signed-off-by: Stephen Rothwell <[email-masked]>
---
 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                    [email-masked]
http://www.canb.auug.org.au/~sfr/