summaryrefslogtreecommitdiff
path: root/arch/s390/kvm/kvm-s390.c
diff options
context:
space:
mode:
authorMartin Schwidefsky <schwidefsky@de.ibm.com>2017-10-09 12:16:49 +0300
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2017-10-09 12:16:49 +0300
commit3bdf5679c9e46088a0d677e795afc92b5f77940f (patch)
treebe5a99e62b5ff078413d71297154ece9f724ec9e /arch/s390/kvm/kvm-s390.c
parent91a1fad759ffd616b836984ca0420c7ad5996eef (diff)
parent3d8757b87d7fc15a87928bc970f060bc9c6dc618 (diff)
downloadlinux-3bdf5679c9e46088a0d677e795afc92b5f77940f.tar.xz
Merge branch 'sthyi' into features
Add the store-hypervisor-information code into features using a tip branch for parallel merging into the KVM tree.
Diffstat (limited to 'arch/s390/kvm/kvm-s390.c')
-rw-r--r--arch/s390/kvm/kvm-s390.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 3f8316c2cb2a..4bc70afe0a10 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -1884,8 +1884,6 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long type)
rc = -ENOMEM;
- ratelimit_state_init(&kvm->arch.sthyi_limit, 5 * HZ, 500);
-
kvm->arch.use_esca = 0; /* start with basic SCA */
if (!sclp.has_64bscao)
alloc_flags |= GFP_DMA;