From: David S. Miller <davem@sunset.davemloft.net>
Date: Wed, 13 Jun 2007 06:56:52 +0000 (-0700)
Subject: [SPARC64]: Fix args to sun4v_ldc_revoke().
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

[SPARC64]: Fix args to sun4v_ldc_revoke().

First argument is LDC channel ID, then mapping cookie,
then the MTE revoke cookie.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S
index 7d1a11822a1e..8059531bf0ac 100644
--- a/arch/sparc64/kernel/entry.S
+++ b/arch/sparc64/kernel/entry.S
@@ -2357,8 +2357,9 @@ sun4v_ldc_unmap:
 	 nop
 	.size	sun4v_ldc_unmap, .-sun4v_ldc_unmap
 
-	/* %o0:	cookie
-	 * %o1:	mte_cookie
+	/* %o0: channel
+	 * %o1:	cookie
+	 * %o2:	mte_cookie
 	 *
 	 * returns %o0:	status
 	 */
diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
index 5c2f9d4b9f06..db2130a95d68 100644
--- a/include/asm-sparc64/hypervisor.h
+++ b/include/asm-sparc64/hypervisor.h
@@ -2615,8 +2615,9 @@ struct ldc_mtable_entry {
 /* ldc_revoke()
  * TRAP:	HV_FAST_TRAP
  * FUNCTION:	HV_FAST_LDC_REVOKE
- * ARG0:	cookie
- * ARG1:	ldc_mtable_entry cookie
+ * ARG0:	channel ID
+ * ARG1:	cookie
+ * ARG2:	ldc_mtable_entry cookie
  * RET0:	status
  */
 #define HV_FAST_LDC_REVOKE		0xef
@@ -2663,7 +2664,8 @@ extern unsigned long sun4v_ldc_mapin(unsigned long channel,
 				     unsigned long *ra,
 				     unsigned long *perm);
 extern unsigned long sun4v_ldc_unmap(unsigned long ra);
-extern unsigned long sun4v_ldc_revoke(unsigned long cookie,
+extern unsigned long sun4v_ldc_revoke(unsigned long channel,
+				      unsigned long cookie,
 				      unsigned long mte_cookie);
 #endif