---

yaml --- r: 57731 b: refs/heads/master c: fc395f8 h: refs/heads/master i: 57729: de33f99 57727: c06840c v: v3
git-mirror · Jun 13, 2007 · 90f303c · 90f303c
1 parent 374b1a8
commit 90f303c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f467b998eeae933029a83db8ad860da3879acd63
+refs/heads/master: fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f
diff --git a/trunk/arch/sparc64/kernel/entry.S b/trunk/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/trunk/include/asm-sparc64/hypervisor.h b/trunk/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