|
@@ -27,7 +27,6 @@
|
|
|
/*
|
|
|
* diag210 is used under VM to get information about a virtual device
|
|
|
*/
|
|
|
-#ifdef CONFIG_64BIT
|
|
|
int
|
|
|
diag210(struct diag210 * addr)
|
|
|
{
|
|
@@ -43,6 +42,7 @@ diag210(struct diag210 * addr)
|
|
|
spin_lock_irqsave(&diag210_lock, flags);
|
|
|
diag210_tmp = *addr;
|
|
|
|
|
|
+#ifdef CONFIG_64BIT
|
|
|
asm volatile(
|
|
|
" lhi %0,-1\n"
|
|
|
" sam31\n"
|
|
@@ -51,19 +51,8 @@ diag210(struct diag210 * addr)
|
|
|
" srl %0,28\n"
|
|
|
"1: sam64\n"
|
|
|
EX_TABLE(0b,1b)
|
|
|
- : "=&d" (ccode) : "a" (__pa(&diag210_tmp)) : "cc", "memory");
|
|
|
-
|
|
|
- *addr = diag210_tmp;
|
|
|
- spin_unlock_irqrestore(&diag210_lock, flags);
|
|
|
-
|
|
|
- return ccode;
|
|
|
-}
|
|
|
+ : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
|
|
|
#else
|
|
|
-int
|
|
|
-diag210(struct diag210 * addr)
|
|
|
-{
|
|
|
- int ccode;
|
|
|
-
|
|
|
asm volatile(
|
|
|
" lhi %0,-1\n"
|
|
|
" diag %1,0,0x210\n"
|
|
@@ -71,11 +60,14 @@ diag210(struct diag210 * addr)
|
|
|
" srl %0,28\n"
|
|
|
"1:\n"
|
|
|
EX_TABLE(0b,1b)
|
|
|
- : "=&d" (ccode) : "a" (__pa(addr)) : "cc", "memory");
|
|
|
+ : "=&d" (ccode) : "a" (&diag210_tmp) : "cc", "memory");
|
|
|
+#endif
|
|
|
+
|
|
|
+ *addr = diag210_tmp;
|
|
|
+ spin_unlock_irqrestore(&diag210_lock, flags);
|
|
|
|
|
|
return ccode;
|
|
|
}
|
|
|
-#endif
|
|
|
|
|
|
/*
|
|
|
* Input :
|