From 17d853d0f36e17e2095965720f58b4f7bf8f4951 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 17 Sep 2010 07:48:25 +1000 Subject: [PATCH 38/53] 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 e0fe76c..310d1ab 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S @@ -360,10 +360,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.6.3.3