diff options
| author | Linus Torvalds | 2013-11-22 18:56:07 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2013-11-22 18:56:07 +0100 |
| commit | c874e6fc3596322b0248df3158dd9d5f43a958d0 (patch) | |
| tree | fd89609fe1f7a0b7c7031daee21ca9e0eaa9c1dd /arch/x86 | |
| parent | Merge git://git.kvack.org/~bcrl/aio-next (diff) | |
| parent | KVM: kvm_clear_guest_page(): fix empty_zero_page usage (diff) | |
| download | kernel-qcow2-linux-c874e6fc3596322b0248df3158dd9d5f43a958d0.tar.gz kernel-qcow2-linux-c874e6fc3596322b0248df3158dd9d5f43a958d0.tar.xz kernel-qcow2-linux-c874e6fc3596322b0248df3158dd9d5f43a958d0.zip | |
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.c | 2 |
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 = { .get = param_get_bool, }; -module_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644); +arch_param_cb(mmu_audit, &audit_param_ops, &mmu_audit, 0644); |