diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 16:15:57 +1100 |
| commit | de8fdfbee55bdebd048ec45854c9c0fc30240c7f (patch) | |
| tree | 3c193ea8ced47b9018eb3bd1a73956d2b9d564fd /arch/x86/kvm/mmu.c | |
| parent | 6641ce8e95e9cb5c678cf882f9eb7c7632fa1a2c (diff) | |
| parent | 171cef6d6ec6c1b4e95f2053545b2dd91931518b (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 * |