diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-15 12:59:21 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-12-15 12:59:21 +1100 |
| commit | 7b1cf3b69601022c296e0da02c5f296b7267df42 (patch) | |
| tree | 8bd93816887a55fd8f856784aad99bf9dce90db2 /virt | |
| parent | ea472a6fe5aca5599dcc35e82028da0fa7510a81 (diff) | |
| parent | 589cde432c02376f863fca98c3e7549f64d78559 (diff) | |
Merge remote-tracking branch 'kspp/for-next/kspp'
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/kvm_main.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 96e24c21eac3..a1037659c4fa 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -4010,8 +4010,12 @@ int kvm_init(void *opaque, unsigned vcpu_size, unsigned vcpu_align, /* A kmem cache lets us meet the alignment requirements of fx_save. */ if (!vcpu_align) vcpu_align = __alignof__(struct kvm_vcpu); - kvm_vcpu_cache = kmem_cache_create("kvm_vcpu", vcpu_size, vcpu_align, - SLAB_ACCOUNT, NULL); + kvm_vcpu_cache = + kmem_cache_create_usercopy("kvm_vcpu", vcpu_size, vcpu_align, + SLAB_ACCOUNT, + offsetof(struct kvm_vcpu, arch), + sizeof_field(struct kvm_vcpu, arch), + NULL); if (!kvm_vcpu_cache) { r = -ENOMEM; goto out_free_3; |