From: Heiko Carstens <heiko.carstens@de.ibm.com>
Date: Mon, 5 Feb 2007 20:16:58 +0000 (+0100)
Subject: [S390] Simplify virt_to_phys.
X-Git-Tag: v2.6.21-rc1~92^2~41^2~30
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3b0b4af2c7593af6dfe92afa1033033c4746ec11;p=linux-2.6

[S390] Simplify virt_to_phys.

No need to use lrag in 64 bit addressing mode since lra will do the
same.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
---

diff --git a/include/asm-s390/io.h b/include/asm-s390/io.h
index efb7de9c1c..a4c2d550da 100644
--- a/include/asm-s390/io.h
+++ b/include/asm-s390/io.h
@@ -28,11 +28,7 @@ static inline unsigned long virt_to_phys(volatile void * address)
 {
 	unsigned long real_address;
 	asm volatile(
-#ifndef __s390x__
 		 "	lra	%0,0(%1)\n"
-#else /* __s390x__ */
-		 "	lrag	%0,0(%1)\n"
-#endif /* __s390x__ */
 		 "	jz	0f\n"
 		 "	la	%0,0\n"
                  "0:"