Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f Commit: fc395f8d589f4f0b3fcdd9b8bb84b7cacf711a4f Parent: f467b998eeae933029a83db8ad860da3879acd63 Author: David S. Miller <[EMAIL PROTECTED]> AuthorDate: Tue Jun 12 23:56:52 2007 -0700 Committer: David S. Miller <[EMAIL PROTECTED]> CommitDate: Wed Jun 13 00:01:27 2007 -0700
[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 <[EMAIL PROTECTED]> --- arch/sparc64/kernel/entry.S | 5 +++-- include/asm-sparc64/hypervisor.h | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/sparc64/kernel/entry.S b/arch/sparc64/kernel/entry.S index 7d1a118..8059531 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 5c2f9d4..db2130a 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 - To unsubscribe from this list: send the line "unsubscribe git-commits-head" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html