diff options
| author | arutz <none@none> | 2007-05-24 12:06:56 -0700 |
|---|---|---|
| committer | arutz <none@none> | 2007-05-24 12:06:56 -0700 |
| commit | 9c7f0c7949f4f8c13342ed0167ea42f8d77b5f21 (patch) | |
| tree | 301f5db972599628f0b04227f846e02f88419007 | |
| parent | 0e8c61582669940ab28fea7e6dd2935372681236 (diff) | |
| download | illumos-joyent-9c7f0c7949f4f8c13342ed0167ea42f8d77b5f21.tar.gz | |
6449978 sun4v context registers do not require masking - CTXREG_CTX_MASK should be removed for sun4v
| -rw-r--r-- | usr/src/uts/sun4v/sys/mmu.h | 5 | ||||
| -rw-r--r-- | usr/src/uts/sun4v/vm/mach_sfmmu_asm.s | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/usr/src/uts/sun4v/sys/mmu.h b/usr/src/uts/sun4v/sys/mmu.h index 86653756cd..b4067b25df 100644 --- a/usr/src/uts/sun4v/sys/mmu.h +++ b/usr/src/uts/sun4v/sys/mmu.h @@ -131,11 +131,6 @@ extern "C" { #define TAGACC_CTX_LSHIFT (64 - TAGACC_SHIFT) /* - * MMU PRIMARY/SECONDARY CONTEXT register - */ -#define CTXREG_CTX_MASK 0xFFFF - -/* * The kernel always runs in KCONTEXT, and no user mappings * are ever valid in it (so any user access pagefaults). */ diff --git a/usr/src/uts/sun4v/vm/mach_sfmmu_asm.s b/usr/src/uts/sun4v/vm/mach_sfmmu_asm.s index cf21f174bb..bbec4ee675 100644 --- a/usr/src/uts/sun4v/vm/mach_sfmmu_asm.s +++ b/usr/src/uts/sun4v/vm/mach_sfmmu_asm.s @@ -19,7 +19,7 @@ * CDDL HEADER END */ /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2007 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -213,18 +213,14 @@ sfmmu_load_mmustate(sfmmu_t *sfmmup) ENTRY_NP(sfmmu_getctx_pri) set MMU_PCONTEXT, %o0 - set CTXREG_CTX_MASK, %o1 - ldxa [%o0]ASI_MMU_CTX, %o0 retl - and %o0, %o1, %o0 + ldxa [%o0]ASI_MMU_CTX, %o0 SET_SIZE(sfmmu_getctx_pri) ENTRY_NP(sfmmu_getctx_sec) set MMU_SCONTEXT, %o0 - set CTXREG_CTX_MASK, %o1 - ldxa [%o0]ASI_MMU_CTX, %o0 retl - and %o0, %o1, %o0 + ldxa [%o0]ASI_MMU_CTX, %o0 SET_SIZE(sfmmu_getctx_sec) /* |