aboutsummaryrefslogtreecommitdiff
path: root/target-i386/cpu.h
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2014-03-28 11:28:38 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2014-06-05 16:10:34 +0200
commit43773ed369a2e1f6c347e30c74df27a8750d1d2d (patch)
tree14526198832294b4f55a5aaa5eb42d79c7c33c1e /target-i386/cpu.h
parentc773828aa9259664bc24272b0cab781245409e1f (diff)
downloadqemu-43773ed369a2e1f6c347e30c74df27a8750d1d2d.zip
qemu-43773ed369a2e1f6c347e30c74df27a8750d1d2d.tar.gz
qemu-43773ed369a2e1f6c347e30c74df27a8750d1d2d.tar.bz2
target-i386: rename KSMAP to KNOSMAP
This is the mode where SMAP is overridden, put "NO" in its name. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'target-i386/cpu.h')
-rw-r--r--target-i386/cpu.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/target-i386/cpu.h b/target-i386/cpu.h
index e9cbdab..f88b675 100644
--- a/target-i386/cpu.h
+++ b/target-i386/cpu.h
@@ -1155,15 +1155,15 @@ static inline CPUX86State *cpu_init(const char *cpu_model)
/* MMU modes definitions */
#define MMU_MODE0_SUFFIX _kernel
#define MMU_MODE1_SUFFIX _user
-#define MMU_MODE2_SUFFIX _ksmap /* Kernel with SMAP override */
+#define MMU_MODE2_SUFFIX _knosmap /* SMAP disabled or CPL<3 && AC=1 */
#define MMU_KERNEL_IDX 0
#define MMU_USER_IDX 1
-#define MMU_KSMAP_IDX 2
+#define MMU_KNOSMAP_IDX 2
static inline int cpu_mmu_index (CPUX86State *env)
{
return (env->hflags & HF_CPL_MASK) == 3 ? MMU_USER_IDX :
((env->hflags & HF_SMAP_MASK) && (env->eflags & AC_MASK))
- ? MMU_KSMAP_IDX : MMU_KERNEL_IDX;
+ ? MMU_KNOSMAP_IDX : MMU_KERNEL_IDX;
}
#define CC_DST (env->cc_dst)