Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[linux-2.6-omap-h63xx.git] / include / asm-sparc64 / hypervisor.h

diff --git a/include/asm-sparc64/hypervisor.h b/include/asm-sparc64/hypervisor.h
index 5c2f9d4b9f06070813dad3cfe907aca906bbe080..524d49835dfd2002484bfecaec3d47e5fc957dea 100644 (file)
--- a/include/asm-sparc64/hypervisor.h
+++ b/include/asm-sparc64/hypervisor.h
@@ -98,7 +98,7 @@
 #define HV_FAST_MACH_EXIT              0x00
 
 #ifndef __ASSEMBLY__
-extern void sun4v_mach_exit(unsigned long exit_core);
+extern void sun4v_mach_exit(unsigned long exit_code);
 #endif
 
 /* Domain services.  */
@@ -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