4 files changed, 7 insertions, 9 deletions

diff --git a/drivers/gpu/drm/drm_fops.c b/drivers/gpu/drm/drm_fops.c
index 330f3dd8e9d0..7f2af9aca038 100644
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
@@ -391,8 +391,6 @@ static void drm_legacy_dev_reinit(struct drm_device *dev)
         if (drm_core_check_feature(dev, DRIVER_MODESET))
                 return;
 
-        atomic_set(&dev->vma_count, 0);
-
         dev->sigdata.lock = NULL;
 
         dev->context_flag = 0;
diff --git a/drivers/gpu/drm/drm_info.c b/drivers/gpu/drm/drm_info.c
index 31da45c582fc..7473035dd28b 100644
--- a/drivers/gpu/drm/drm_info.c
+++ b/drivers/gpu/drm/drm_info.c
@@ -234,14 +234,18 @@ int drm_vma_info(struct seq_file *m, void *data)
         struct drm_device *dev = node->minor->dev;
         struct drm_vma_entry *pt;
         struct vm_area_struct *vma;
+        unsigned long vma_count = 0;
 #if defined(__i386__)
         unsigned int pgprot;
 #endif
 
         mutex_lock(&dev->struct_mutex);
-        seq_printf(m, "vma use count: %d, high_memory = %pK, 0x%pK\n",
-                   atomic_read(&dev->vma_count),
-                   high_memory, (void *)(unsigned long)virt_to_phys(high_memory));
+        list_for_each_entry(pt, &dev->vmalist, head)
+                vma_count++;
+
+        seq_printf(m, "vma use count: %lu, high_memory = %pK, 0x%pK\n",
+                   vma_count, high_memory,
+                   (void *)(unsigned long)virt_to_phys(high_memory));
 
         list_for_each_entry(pt, &dev->vmalist, head) {
                 vma = pt->vma;
diff --git a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c
index ef5540b6b451..24e045c4f531 100644
--- a/drivers/gpu/drm/drm_vm.c
+++ b/drivers/gpu/drm/drm_vm.c
@@ -220,7 +220,6 @@ static void drm_vm_shm_close(struct vm_area_struct *vma)
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
                   vma->vm_start, vma->vm_end - vma->vm_start);
-        atomic_dec(&dev->vma_count);
 
         map = vma->vm_private_data;
 
@@ -405,7 +404,6 @@ void drm_vm_open_locked(struct drm_device *dev,
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
                   vma->vm_start, vma->vm_end - vma->vm_start);
-        atomic_inc(&dev->vma_count);
 
         vma_entry = kmalloc(sizeof(*vma_entry), GFP_KERNEL);
         if (vma_entry) {
@@ -433,7 +431,6 @@ void drm_vm_close_locked(struct drm_device *dev,
 
         DRM_DEBUG("0x%08lx,0x%08lx\n",
                   vma->vm_start, vma->vm_end - vma->vm_start);
-        atomic_dec(&dev->vma_count);
 
         list_for_each_entry_safe(pt, temp, &dev->vmalist, head) {
                 if (pt->vma == vma) {
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 5b6c33ce776f..2fe9b5d5d162 100644
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
@@ -1109,7 +1109,6 @@ struct drm_device {
         /** \name Usage Counters */
         /*@{ */
         int open_count;                 /**< Outstanding files open */
-        atomic_t vma_count;             /**< Outstanding vma areas open */
         int buf_use;                    /**< Buffers in use -- cannot alloc */
         atomic_t buf_alloc;             /**< Buffer allocation in progress */
         /*@} */