linux-kernel - [PATCH] gma500: fix build error in drivers/staging/gma500/gem

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Sun,  7 Aug 2011 02:52:07 +0800
From:	stufever@...il.com
To:	linux-kernel@...r.kernel.org
Cc:	gregkh@...e.de, alan@...ux.intel.com,
	Wang Shaoyan <wangshaoyan.pt@...bao.com>
Subject: [PATCH] gma500: fix build error in drivers/staging/gma500/gem_glue.c

From: Wang Shaoyan <wangshaoyan.pt@...bao.com>

  LD      drivers/built-in.o
  drivers/staging/built-in.o: In function 'drm_gem_private_object_init':
  /home/stufever/linux-2.6/drivers/staging/gma500/gem_glue.c:30: multiple definition of 'drm_gem_private_object_init'
  drivers/gpu/built-in.o:/home/stufever/linux-2.6/drivers/gpu/drm/drm_gem.c:160: first defined here
  make[1]: *** [drivers/built-in.o] Error 1
  make: *** [drivers] Error 2

The function drm_gem_private_object_init had been EXPORT_SYMBOL at drivers/gpu/drm/drm_gem.c, so delete repeated code.

Signed-off-by: Wang Shaoyan <wangshaoyan.pt@...bao.com>
---
 drivers/staging/gma500/gem_glue.c |   20 --------------------
 1 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/drivers/staging/gma500/gem_glue.c b/drivers/staging/gma500/gem_glue.c
index 779ac1a..6770166 100644
--- a/drivers/staging/gma500/gem_glue.c
+++ b/drivers/staging/gma500/gem_glue.c
@@ -20,26 +20,6 @@
 #include <drm/drmP.h>
 #include <drm/drm.h>
 
-/**
- * Initialize an already allocated GEM object of the specified size with
- * no GEM provided backing store. Instead the caller is responsible for
- * backing the object and handling it.
- */
-int drm_gem_private_object_init(struct drm_device *dev,
-			struct drm_gem_object *obj, size_t size)
-{
-	BUG_ON((size & (PAGE_SIZE - 1)) != 0);
-
-	obj->dev = dev;
-	obj->filp = NULL;
-
-	kref_init(&obj->refcount);
-	atomic_set(&obj->handle_count, 0);
-	obj->size = size;
-
-	return 0;
-}
-
 void drm_gem_object_release_wrap(struct drm_gem_object *obj)
 {
 	/* Remove the list map if one is present */
-- 
1.7.0.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/