From 4d7b4d47bb1a15175c2443a995ac17ed44a99ae2 Mon Sep 17 00:00:00 2001 From: Daniel J Blueman Date: Fri, 24 Sep 2010 10:10:23 +1000 Subject: [PATCH] --- yaml --- r: 210950 b: refs/heads/master c: d3147e86d71e74c93d361988d9441575da71345e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_buffer.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 386324eed0be..40c45227a681 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0e57a3cc71884ef38e0568b63e004e2c782ea6d2 +refs/heads/master: d3147e86d71e74c93d361988d9441575da71345e diff --git a/trunk/drivers/gpu/drm/drm_buffer.c b/trunk/drivers/gpu/drm/drm_buffer.c index 55d03ed05000..529a0dbe9fc6 100644 --- a/trunk/drivers/gpu/drm/drm_buffer.c +++ b/trunk/drivers/gpu/drm/drm_buffer.c @@ -98,8 +98,8 @@ 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, - void __user *user_data, int size) +int drm_buffer_copy_from_user(struct drm_buffer *buf, + void __user *user_data, int size) { int nr_pages = size / PAGE_SIZE + 1; int idx; @@ -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];