From: Martin Schwidefsky <schwidefsky@de.ibm.com>
Date: Mon, 12 Feb 2007 14:49:57 +0000 (+0100)
Subject: [S390] remove __io_virt and mmiowb.
X-Git-Tag: v2.6.21-rc1~274^2~3^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=022ae414daadb718130679e4eacc105521f11ec7;p=linux-2.6-omap-h63xx.git

[S390] remove __io_virt and mmiowb.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
index dca6a6cc103..b7ff6afc3ca 100644
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
@@ -17,8 +17,6 @@
 
 #define IO_SPACE_LIMIT 0xffffffff
 
-#define __io_virt(x)            ((void *)(PAGE_OFFSET | (unsigned long)(x)))
-
 /*
  * Change virtual addresses to physical addresses and vv.
  * These are pretty trivial
@@ -37,11 +35,9 @@ static inline unsigned long virt_to_phys(volatile void * address)
 
 static inline void * phys_to_virt(unsigned long address)
 {
-        return __io_virt(address);
+	return (void *) address;
 }
 
-#define mmiowb()	do { } while (0)
-
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
  * access