1 files changed, 12 insertions, 36 deletions

diff --git a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c
index 2092e7bb788f..3e257a50bf56 100644
--- a/drivers/gpu/drm/drm_bufs.c
+++ b/drivers/gpu/drm/drm_bufs.c
@@ -39,19 +39,6 @@
 #include <asm/shmparam.h>
 #include "drmP.h"
 
-resource_size_t drm_get_resource_start(struct drm_device *dev, unsigned int resource)
-{
-        return pci_resource_start(dev->pdev, resource);
-}
-EXPORT_SYMBOL(drm_get_resource_start);
-
-resource_size_t drm_get_resource_len(struct drm_device *dev, unsigned int resource)
-{
-        return pci_resource_len(dev->pdev, resource);
-}
-
-EXPORT_SYMBOL(drm_get_resource_len);
-
 static struct drm_map_list *drm_find_matching_map(struct drm_device *dev,
                                                   struct drm_local_map *map)
 {
@@ -189,7 +176,7 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
         switch (map->type) {
         case _DRM_REGISTERS:
         case _DRM_FRAME_BUFFER:
-#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__)
+#if !defined(__sparc__) && !defined(__alpha__) && !defined(__ia64__) && !defined(__powerpc64__) && !defined(__x86_64__) && !defined(__arm__)
                 if (map->offset + (map->size-1) < map->offset ||
                     map->offset < virt_to_phys(high_memory)) {
                         kfree(map);
@@ -341,14 +328,13 @@ static int drm_addmap_core(struct drm_device * dev, resource_size_t offset,
                 return -EINVAL;
         }
 
-        list = kmalloc(sizeof(*list), GFP_KERNEL);
+        list = kzalloc(sizeof(*list), GFP_KERNEL);
         if (!list) {
                 if (map->type == _DRM_REGISTERS)
                         iounmap(map->handle);
                 kfree(map);
                 return -EINVAL;
         }
-        memset(list, 0, sizeof(*list));
         list->map = map;
 
         mutex_lock(&dev->struct_mutex);
@@ -691,13 +677,12 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
                 return -EINVAL;
         }
 
-        entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);
+        entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);
         if (!entry->buflist) {
                 mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
-        memset(entry->buflist, 0, count * sizeof(*entry->buflist));
 
         entry->buf_size = size;
         entry->page_order = page_order;
@@ -721,7 +706,7 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
                 buf->file_priv = NULL;
 
                 buf->dev_priv_size = dev->driver->dev_priv_size;
-                buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);
+                buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);
                 if (!buf->dev_private) {
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
@@ -730,7 +715,6 @@ int drm_addbufs_agp(struct drm_device * dev, struct drm_buf_desc * request)
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
-                memset(buf->dev_private, 0, buf->dev_priv_size);
 
                 DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
 
@@ -845,22 +829,20 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
                 return -EINVAL;
         }
 
-        entry->buflist = kmalloc(count * sizeof(*entry->buflist), GFP_KERNEL);
+        entry->buflist = kzalloc(count * sizeof(*entry->buflist), GFP_KERNEL);
         if (!entry->buflist) {
                 mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
-        memset(entry->buflist, 0, count * sizeof(*entry->buflist));
 
-        entry->seglist = kmalloc(count * sizeof(*entry->seglist), GFP_KERNEL);
+        entry->seglist = kzalloc(count * sizeof(*entry->seglist), GFP_KERNEL);
         if (!entry->seglist) {
                 kfree(entry->buflist);
                 mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
-        memset(entry->seglist, 0, count * sizeof(*entry->seglist));
 
         /* Keep the original pagelist until we know all the allocations
          * have succeeded
@@ -924,8 +906,8 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
                         buf->file_priv = NULL;
 
                         buf->dev_priv_size = dev->driver->dev_priv_size;
-                        buf->dev_private = kmalloc(buf->dev_priv_size,
-                                                  GFP_KERNEL);
+                        buf->dev_private = kzalloc(buf->dev_priv_size,
+                                                GFP_KERNEL);
                         if (!buf->dev_private) {
                                 /* Set count correctly so we free the proper amount. */
                                 entry->buf_count = count;
@@ -936,7 +918,6 @@ int drm_addbufs_pci(struct drm_device * dev, struct drm_buf_desc * request)
                                 atomic_dec(&dev->buf_alloc);
                                 return -ENOMEM;
                         }
-                        memset(buf->dev_private, 0, buf->dev_priv_size);
 
                         DRM_DEBUG("buffer %d @ %p\n",
                                   entry->buf_count, buf->address);
@@ -1061,14 +1042,13 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
                 return -EINVAL;
         }
 
-        entry->buflist = kmalloc(count * sizeof(*entry->buflist),
+        entry->buflist = kzalloc(count * sizeof(*entry->buflist),
                                 GFP_KERNEL);
         if (!entry->buflist) {
                 mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
-        memset(entry->buflist, 0, count * sizeof(*entry->buflist));
 
         entry->buf_size = size;
         entry->page_order = page_order;
@@ -1093,7 +1073,7 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
                 buf->file_priv = NULL;
 
                 buf->dev_priv_size = dev->driver->dev_priv_size;
-                buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);
+                buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);
                 if (!buf->dev_private) {
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
@@ -1103,8 +1083,6 @@ static int drm_addbufs_sg(struct drm_device * dev, struct drm_buf_desc * request
                         return -ENOMEM;
                 }
 
-                memset(buf->dev_private, 0, buf->dev_priv_size);
-
                 DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);
 
                 offset += alignment;
@@ -1222,14 +1200,13 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request
                 return -EINVAL;
         }
 
-        entry->buflist = kmalloc(count * sizeof(*entry->buflist),
+        entry->buflist = kzalloc(count * sizeof(*entry->buflist),
                                 GFP_KERNEL);
         if (!entry->buflist) {
                 mutex_unlock(&dev->struct_mutex);
                 atomic_dec(&dev->buf_alloc);
                 return -ENOMEM;
         }
-        memset(entry->buflist, 0, count * sizeof(*entry->buflist));
 
         entry->buf_size = size;
         entry->page_order = page_order;
@@ -1253,7 +1230,7 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request
                 buf->file_priv = NULL;
 
                 buf->dev_priv_size = dev->driver->dev_priv_size;
-                buf->dev_private = kmalloc(buf->dev_priv_size, GFP_KERNEL);
+                buf->dev_private = kzalloc(buf->dev_priv_size, GFP_KERNEL);
                 if (!buf->dev_private) {
                         /* Set count correctly so we free the proper amount. */
                         entry->buf_count = count;
@@ -1262,7 +1239,6 @@ static int drm_addbufs_fb(struct drm_device * dev, struct drm_buf_desc * request
                         atomic_dec(&dev->buf_alloc);
                         return -ENOMEM;
                 }
-                memset(buf->dev_private, 0, buf->dev_priv_size);
 
                 DRM_DEBUG("buffer %d @ %p\n", entry->buf_count, buf->address);