Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[sfrench/cifs-2.6.git] / arch / s390 / kvm / interrupt.c

diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
index 2f177298c663ba102a01b212957cee89fdc44af2..e3183bd059107a04f7695ee707da18f1bea2153d 100644 (file)
--- a/arch/s390/kvm/interrupt.c
+++ b/arch/s390/kvm/interrupt.c
@@ -1792,7 +1792,7 @@ struct kvm_s390_interrupt_info *kvm_s390_get_io_int(struct kvm *kvm,
                goto out;
        }
 gisa_out:
-       tmp_inti = kzalloc(sizeof(*inti), GFP_KERNEL);
+       tmp_inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);
        if (tmp_inti) {
                tmp_inti->type = KVM_S390_INT_IO(1, 0, 0, 0);
                tmp_inti->io.io_int_word = isc_to_int_word(isc);
@@ -2015,7 +2015,7 @@ int kvm_s390_inject_vm(struct kvm *kvm,
        struct kvm_s390_interrupt_info *inti;
        int rc;
 
-       inti = kzalloc(sizeof(*inti), GFP_KERNEL);
+       inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);
        if (!inti)
                return -ENOMEM;
 
@@ -2414,7 +2414,7 @@ static int enqueue_floating_irq(struct kvm_device *dev,
                return -EINVAL;
 
        while (len >= sizeof(struct kvm_s390_irq)) {
-               inti = kzalloc(sizeof(*inti), GFP_KERNEL);
+               inti = kzalloc(sizeof(*inti), GFP_KERNEL_ACCOUNT);
                if (!inti)
                        return -ENOMEM;
 
@@ -2462,7 +2462,7 @@ static int register_io_adapter(struct kvm_device *dev,
        if (dev->kvm->arch.adapters[adapter_info.id] != NULL)
                return -EINVAL;
 
-       adapter = kzalloc(sizeof(*adapter), GFP_KERNEL);
+       adapter = kzalloc(sizeof(*adapter), GFP_KERNEL_ACCOUNT);
        if (!adapter)
                return -ENOMEM;
 
@@ -3290,7 +3290,7 @@ int kvm_s390_gib_init(u8 nisc)
                goto out;
        }
 
-       gib = (struct kvm_s390_gib *)get_zeroed_page(GFP_KERNEL | GFP_DMA);
+       gib = (struct kvm_s390_gib *)get_zeroed_page(GFP_KERNEL_ACCOUNT | GFP_DMA);
        if (!gib) {
                rc = -ENOMEM;
                goto out;