diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-09 17:03:46 +1100 |
commit | 4824579dcd8be7c8580237785ce6f7b31db054ea (patch) | |
tree | 174a084a5068489ab7030227c231fe6f7d0e3124 /arch/x86/kvm/mmu.c | |
parent | a9be5a59553a6b5d424d8ed37f058edfcc09a7d9 (diff) | |
parent | 1842d91b7b4c6be23064b6601127293173aa750c (diff) |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 2fd7586aad4d..1cda35277278 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -4102,7 +4102,7 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu, * as a SMAP violation if all of the following * conditions are ture: * - X86_CR4_SMAP is set in CR4 - * - An user page is accessed + * - A user page is accessed * - Page fault in kernel mode * - if CPL = 3 or X86_EFLAGS_AC is clear * |