From 90f303c58252622f1abc0a016844c7cd1d10c80f Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Tue, 12 Jun 2007 23:56:52 -0700 Subject: [PATCH] --- yaml --- r: 57731 b: refs/heads/master c: fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f h: refs/heads/master i: 57729: de33f99d323b8b0647da402a64a9f59ae7504e4f 57727: c06840c3e80ed85b6312d976915160993df844a9 v: v3 --- [refs] | 2 +- trunk/arch/sparc64/kernel/entry.S | 5 +++-- trunk/include/asm-sparc64/hypervisor.h | 8 +++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2ecd178aada1..aabcab110138 100644 --- 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 index 7d1a11822a1e..8059531bf0ac 100644 --- 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 index 5c2f9d4b9f06..db2130a95d68 100644 --- 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