diff --git a/[refs] b/[refs]
index 6a19daa2d9b3..2ddcb8438062 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 92b9af9e4f144535c65aee673cfad309f25fa465
+refs/heads/master: 5ce04e3de8c36ba37c56e94e3c4dc7973c7f546c
diff --git a/trunk/include/linux/io-mapping.h b/trunk/include/linux/io-mapping.h
index cbc2f0cd631b..0adb0f91568c 100644
--- a/trunk/include/linux/io-mapping.h
+++ b/trunk/include/linux/io-mapping.h
@@ -91,8 +91,11 @@ io_mapping_unmap_atomic(void *vaddr)
 static inline void *
 io_mapping_map_wc(struct io_mapping *mapping, unsigned long offset)
 {
+	resource_size_t phys_addr;
+
 	BUG_ON(offset >= mapping->size);
-	resource_size_t phys_addr = mapping->base + offset;
+	phys_addr = mapping->base + offset;
+
 	return ioremap_wc(phys_addr, PAGE_SIZE);
 }