From patchwork Wed Sep 22 16:53:38 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel J Blueman X-Patchwork-Id: 199902 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8MGruSM024357 for ; Wed, 22 Sep 2010 16:54:31 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 05E7C9E92C for ; Wed, 22 Sep 2010 09:53:56 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pv0-f177.google.com (mail-pv0-f177.google.com [74.125.83.177]) by gabe.freedesktop.org (Postfix) with ESMTP id 9AAB09EEFE for ; Wed, 22 Sep 2010 09:53:38 -0700 (PDT) Received: by pvg12 with SMTP id 12so258818pvg.36 for ; Wed, 22 Sep 2010 09:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:received:date:message-id :subject:from:to:cc:content-type; bh=eoSP6QVumEcD1mwR28wbMpZ92D7VrWiCRgi2DR78zY8=; b=rMJoS6wXdZ6aZotbtuEUCFf1nY5JrTuNxNz/tL+dtX2QmSUSw4ajgAxL3zPws4FL0c LOY1HRF0z5E8tN2hYmsmDU5V3HqXpp2PVMmmNSD4Y5FIqSI//XPM6aj7RBxYrTO0s4mp FX+0oFHi7EHi8oGgxLaqa6OLS4ybnDxIr4wRQ= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:cc:content-type; b=bDz2fJPWculbNTy3ryp13trNzadXaLDRmfYQqt8P9flARSDHp0neqlMGYmQ0lNPPx2 Ev0ItwO11zxuUdQU8X/0lj4iQ/hmPzjGVIOuUHouMRbgTu8tZoDIOYISHyYQot+Y4dNC wT5hPjLeiBfvJzX1lyVfEzqLSd4rbFL0qL11c= MIME-Version: 1.0 Received: by 10.142.47.7 with SMTP id u7mr408511wfu.46.1285174418384; Wed, 22 Sep 2010 09:53:38 -0700 (PDT) Received: by 10.231.207.81 with HTTP; Wed, 22 Sep 2010 09:53:38 -0700 (PDT) Date: Wed, 22 Sep 2010 17:53:38 +0100 Message-ID: Subject: [2.6.36-rc5] DRM fixes... From: Daniel J Blueman To: David Airlie Cc: Linux Kernel , dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 22 Sep 2010 16:54:31 +0000 (UTC) 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];