[2.6.36-rc5] DRM fixes...

Commit Message

Daniel J Blueman Sept. 22, 2010, 4:53 p.m. UTC

None

Patch

diff --git a/drivers/gpu/drm/drm_buffer.c b/drivers/gpu/drm/drm_buffer.c
index 55d03ed..687de5f 100644
--- a/drivers/gpu/drm/drm_buffer.c
+++ b/drivers/gpu/drm/drm_buffer.c
@@ -98,7 +98,7 @@  EXPORT_SYMBOL(drm_buffer_alloc);
  *   user_data: A pointer the data that is copied to the buffer.
  *   size: The Number of bytes to copy.
  */
-extern int drm_buffer_copy_from_user(struct drm_buffer *buf,
+int drm_buffer_copy_from_user(struct drm_buffer *buf,
         void __user *user_data, int size)
 {
     int nr_pages = size / PAGE_SIZE + 1;
@@ -163,7 +163,7 @@  void *drm_buffer_read_object(struct drm_buffer *buf,
 {
     int idx = drm_buffer_index(buf);
     int page = drm_buffer_page(buf);
-    void *obj = 0;
+    void *obj = NULL;

     if (idx + objsize <= PAGE_SIZE) {
         obj = &buf->data[page][idx];