From 6b7d1ead01c5bb857f333fed6f3f223144a420f0 Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Fri, 28 Sep 2012 13:48:48 +0100
Subject: [PATCH] --- yaml --- r: 331495 b: refs/heads/master c:
 a3d7193e3c5d0b2365b9247ef0d4cb549187f32f h: refs/heads/master i:   331493:
 6b2bb5c22c9095e85013e8fe69dc62a53aad5d1f   331491:
 e2cc891aca5e4baaf826cafbb5fb0cb5fc30ad02   331487:
 aff95eedad6983cc0edc2c28fd469643bd727520 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/arm/mm/ioremap.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index f00a975d542f..6064bb0508e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c564df4db85aac8d1d65a56176a0a25f46138064
+refs/heads/master: a3d7193e3c5d0b2365b9247ef0d4cb549187f32f
diff --git a/trunk/arch/arm/mm/ioremap.c b/trunk/arch/arm/mm/ioremap.c
index 566750fa57d4..491f6b3336f5 100644
--- a/trunk/arch/arm/mm/ioremap.c
+++ b/trunk/arch/arm/mm/ioremap.c
@@ -247,6 +247,7 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn,
  	if (!area)
  		return NULL;
  	addr = (unsigned long)area->addr;
+	area->phys_addr = __pfn_to_phys(pfn);
 
 #if !defined(CONFIG_SMP) && !defined(CONFIG_ARM_LPAE)
 	if (DOMAIN_IO == 0 &&