From d38cbd50fd43d2b812ba0a05e9d1fb3ee8ef5763 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 21 Jun 2010 15:12:09 +0100
Subject: [PATCH] --- yaml --- r: 200793 b: refs/heads/master c:
 cf0bb91b3ce7e42142ccea46232da19a9bbf28d5 h: refs/heads/master i:   200791:
 05b373513efe36bb00ab76267abd6a9b5e811e10 v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-vexpress/ct-ca9x4.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ce7cb0f3a895..075d7a937e06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad642d9f58f1af6e96efccb5f84e52c6d01db5c4
+refs/heads/master: cf0bb91b3ce7e42142ccea46232da19a9bbf28d5
diff --git a/trunk/arch/arm/mach-vexpress/ct-ca9x4.c b/trunk/arch/arm/mach-vexpress/ct-ca9x4.c
index 9b11eedba65f..6353459bb567 100644
--- a/trunk/arch/arm/mach-vexpress/ct-ca9x4.c
+++ b/trunk/arch/arm/mach-vexpress/ct-ca9x4.c
@@ -10,6 +10,7 @@
 #include <linux/amba/clcd.h>
 
 #include <asm/clkdev.h>
+#include <asm/pgtable.h>
 #include <asm/hardware/arm_timer.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/hardware/gic.h>
@@ -236,7 +237,7 @@ static void ct_ca9x4_init(void)
 }
 
 MACHINE_START(VEXPRESS, "ARM-Versatile Express CA9x4")
-	.phys_io	= V2M_UART0,
+	.phys_io	= V2M_UART0 & SECTION_MASK,
 	.io_pg_offst	= (__MMIO_P2V(V2M_UART0) >> 18) & 0xfffc,
 	.boot_params	= PHYS_OFFSET + 0x00000100,
 	.map_io		= ct_ca9x4_map_io,