git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
drm_buffer.c
diff --git
a/drivers/gpu/drm/drm_buffer.c
b/drivers/gpu/drm/drm_buffer.c
index
55d03ed
..
529a0db
100644
(file)
--- a/
drivers/gpu/drm/drm_buffer.c
+++ b/
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.
*/
* 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;
{
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);
{
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];
if (idx + objsize <= PAGE_SIZE) {
obj = &buf->data[page][idx];