These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / sgi-gru / grutlbpurge.c

diff --git a/kernel/drivers/misc/sgi-gru/grutlbpurge.c b/kernel/drivers/misc/sgi-gru/grutlbpurge.c
index 2129274..e936d43 100644 (file)
--- a/kernel/drivers/misc/sgi-gru/grutlbpurge.c
+++ b/kernel/drivers/misc/sgi-gru/grutlbpurge.c
@@ -306,19 +306,20 @@ struct gru_mm_struct *gru_register_mmu_notifier(void)
                atomic_inc(&gms->ms_refcnt);
        } else {
                gms = kzalloc(sizeof(*gms), GFP_KERNEL);
-               if (gms) {
-                       STAT(gms_alloc);
-                       spin_lock_init(&gms->ms_asid_lock);
-                       gms->ms_notifier.ops = &gru_mmuops;
-                       atomic_set(&gms->ms_refcnt, 1);
-                       init_waitqueue_head(&gms->ms_wait_queue);
-                       err = __mmu_notifier_register(&gms->ms_notifier, current->mm);
-                       if (err)
-                               goto error;
-               }
+               if (!gms)
+                       return ERR_PTR(-ENOMEM);
+               STAT(gms_alloc);
+               spin_lock_init(&gms->ms_asid_lock);
+               gms->ms_notifier.ops = &gru_mmuops;
+               atomic_set(&gms->ms_refcnt, 1);
+               init_waitqueue_head(&gms->ms_wait_queue);
+               err = __mmu_notifier_register(&gms->ms_notifier, current->mm);
+               if (err)
+                       goto error;
        }
-       gru_dbg(grudev, "gms %p, refcnt %d\n", gms,
-               atomic_read(&gms->ms_refcnt));
+       if (gms)
+               gru_dbg(grudev, "gms %p, refcnt %d\n", gms,
+                       atomic_read(&gms->ms_refcnt));
        return gms;
 error:
        kfree(gms);