From 38ef137b8f6497f3ff6b237c20024f38e51b9252 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 17 Apr 2013 08:46:19 -0700
Subject: [PATCH] --- yaml --- r: 362559 b: refs/heads/master c:
 4f2e29031e6c67802e7370292dd050fd62f337ee h: refs/heads/master i:   362557:
 f85104f43c9457b2f5ccecb985c0cc01eaabc609   362555:
 3b55d3d2f38a096aa3530cc2b690828aa613623c   362551:
 1a2d019cfbfd56e3ca79d4fc98a738213c8c5004   362543:
 0e42520732f0cae79fdc22295c544905ca2d8d88   362527:
 9fa27a05576fc43fe4dccd02b3fcd69d2c266278   362495:
 e1a0a1e1ac1b3091aa497e4f7589c8e08ec128d7 v: v3

---
 [refs]                                | 2 +-
 trunk/arch/s390/include/asm/io.h      | 4 ----
 trunk/arch/s390/include/asm/pgtable.h | 4 ++++
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 39b5c4c6b42a..307fc7b97c25 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 542a67246794a0f346e95129c2a2221480462eba
+refs/heads/master: 4f2e29031e6c67802e7370292dd050fd62f337ee
diff --git a/trunk/arch/s390/include/asm/io.h b/trunk/arch/s390/include/asm/io.h
index 27cb32185ce1..379d96e2105e 100644
--- a/trunk/arch/s390/include/asm/io.h
+++ b/trunk/arch/s390/include/asm/io.h
@@ -50,10 +50,6 @@ void unxlate_dev_mem_ptr(unsigned long phys, void *addr);
 #define ioremap_nocache(addr, size)	ioremap(addr, size)
 #define ioremap_wc			ioremap_nocache
 
-/* TODO: s390 cannot support io_remap_pfn_range... */
-#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) 	       \
-	remap_pfn_range(vma, vaddr, pfn, size, prot)
-
 static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 {
 	return (void __iomem *) offset;
diff --git a/trunk/arch/s390/include/asm/pgtable.h b/trunk/arch/s390/include/asm/pgtable.h
index 4a5443118cfb..3cb47cf02530 100644
--- a/trunk/arch/s390/include/asm/pgtable.h
+++ b/trunk/arch/s390/include/asm/pgtable.h
@@ -57,6 +57,10 @@ extern unsigned long zero_page_mask;
 	 (((unsigned long)(vaddr)) &zero_page_mask))))
 #define __HAVE_COLOR_ZERO_PAGE
 
+/* TODO: s390 cannot support io_remap_pfn_range... */
+#define io_remap_pfn_range(vma, vaddr, pfn, size, prot) 	       \
+	remap_pfn_range(vma, vaddr, pfn, size, prot)
+
 #endif /* !__ASSEMBLY__ */
 
 /*