aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 12:56:07 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-11-22 12:56:07 -0500
commitc874e6fc3596322b0248df3158dd9d5f43a958d0 (patch)
treefd89609fe1f7a0b7c7031daee21ca9e0eaa9c1dd /arch/x86
parentd0f278c1dd0175093ed37ce132395dc689e6987e (diff)
parent8a3caa6d74597c2a083f7c87f866891a0b12540b (diff)
Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Gleb Natapov. * 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm: KVM: kvm_clear_guest_page(): fix empty_zero_page usage kvm: mmu: delay mmu audit activation arm/arm64: KVM: Fix hyp mappings of vmalloc regions
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kvm/mmu_audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu_audit.c b/arch/x86/kvm/mmu_audit.c
index daff69e21150..1185fe7a7f47 100644
--- a/arch/x86/kvm/mmu_audit.c
+++ b/arch/x86/kvm/mmu_audit.c
@@ -296,4 +296,4 @@ static struct kernel_param_ops audit_param_ops = {
296 .get = param_get_bool, 296 .get = param_get_bool,
297}; 297};
298 298
299module_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644); 299arch_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644);