Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6

* 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (24 commits)
  agp/intel: Make intel_i965_mask_memory use dma_addr_t for physical addresses
  agp: add user mapping support to ATI AGP bridge.
  drm/i915: enable GEM on PAE.
  drm/radeon: fix unused variables warning
  agp: switch AGP to use page array instead of unsigned long array
  agpgart: detected ALi M???? chipset with M1621
  drm/radeon: command stream checker for r3xx-r5xx hardware
  drm/radeon: Fully initialize LVDS info also when we can't get it from the ROM.
  radeon: Fix CP byte order on big endian architectures with KMS.
  agp/uninorth: Handle user memory types.
  drm/ttm: Add some powerpc cache flush code.
  radeon: Enable modesetting on non-x86.
  drm/radeon: Respect AGP cant_use_aperture flag.
  drm: EDID endianness fixes.
  drm/radeon: this VRAM vs aperture test is wrong, just remove it.
  drm/ttm: fix an error path to exit function correctly
  drm: Apply "Memory fragmentation from lost alignment blocks"
  ttm: Return -ERESTART when a signal interrupts bo eviction.
  drm: Remove memory debugging infrastructure.
  drm/i915: Clear fence register on tiling stride change.
  ...

1 files changed, 6 insertions, 8 deletions

diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c
index 1fad76289e66..9b9ff46c2378 100644
--- a/drivers/gpu/drm/drm_ioctl.c
+++ b/drivers/gpu/drm/drm_ioctl.c
@@ -93,7 +93,7 @@ int drm_setunique(struct drm_device *dev, void *data,
 
         master->unique_len = u->unique_len;
         master->unique_size = u->unique_len + 1;
-        master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER);
+        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
         if (!master->unique)
                 return -ENOMEM;
         if (copy_from_user(master->unique, u->unique, master->unique_len))
@@ -101,9 +101,8 @@ int drm_setunique(struct drm_device *dev, void *data,
 
         master->unique[master->unique_len] = '\0';
 
-        dev->devname =
-            drm_alloc(strlen(dev->driver->pci_driver.name) +
-                      strlen(master->unique) + 2, DRM_MEM_DRIVER);
+        dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) +
+                               strlen(master->unique) + 2, GFP_KERNEL);
         if (!dev->devname)
                 return -ENOMEM;
 
@@ -138,7 +137,7 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
 
         master->unique_len = 40;
         master->unique_size = master->unique_len;
-        master->unique = drm_alloc(master->unique_size, DRM_MEM_DRIVER);
+        master->unique = kmalloc(master->unique_size, GFP_KERNEL);
         if (master->unique == NULL)
                 return -ENOMEM;
 
@@ -152,9 +151,8 @@ static int drm_set_busid(struct drm_device *dev, struct drm_file *file_priv)
         else
                 master->unique_len = len;
 
-        dev->devname =
-            drm_alloc(strlen(dev->driver->pci_driver.name) + master->unique_len +
-                      2, DRM_MEM_DRIVER);
+        dev->devname = kmalloc(strlen(dev->driver->pci_driver.name) +
+                               master->unique_len + 2, GFP_KERNEL);
         if (dev->devname == NULL)
                 return -ENOMEM;