From patchwork Sat Jun 4 15:36:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Dietrich X-Patchwork-Id: 853242 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 p56Iv48K031189 for ; Mon, 6 Jun 2011 18:57:24 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id DEEE59F029 for ; Mon, 6 Jun 2011 11:57:03 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from faui40.informatik.uni-erlangen.de (faui40.informatik.uni-erlangen.de [131.188.34.40]) by gabe.freedesktop.org (Postfix) with ESMTP id 030659E872 for ; Sat, 4 Jun 2011 08:45:46 -0700 (PDT) Received: from faui49q (unknown [IPv6:2001:638:a00:2a:219:99ff:fe80:685e]) by faui40.informatik.uni-erlangen.de (Postfix) with SMTP id 9816354949D; Sat, 4 Jun 2011 17:36:43 +0200 (CEST) Received: by faui49q (sSMTP sendmail emulation); Sat, 04 Jun 2011 17:36:43 +0200 Date: Sat, 4 Jun 2011 17:36:43 +0200 From: Christian Dietrich To: David Airlie , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, trivial@kernel.org Subject: [PATCH 6/8] drivers/gpu/drm: use printk_ratelimited instead of printk_ratelimit Message-ID: <1a0239725c12da764545a3bd1118a386a0216645.1307199715.git.christian.dietrich@informatik.uni-erlangen.de> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.20 (2009-06-14) X-Mailman-Approved-At: Mon, 06 Jun 2011 11:56:55 -0700 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.6 (demeter1.kernel.org [140.211.167.41]); Mon, 06 Jun 2011 18:57:24 +0000 (UTC) Since printk_ratelimit() shouldn't be used anymore (see comment in include/linux/printk.h), replace it with printk_ratelimited. Signed-off-by: Christian Dietrich --- drivers/gpu/drm/drm_ioc32.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_ioc32.c b/drivers/gpu/drm/drm_ioc32.c index d61d185..4a058c7 100644 --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -28,6 +28,7 @@ * IN THE SOFTWARE. */ #include +#include #include "drmP.h" #include "drm_core.h" @@ -253,10 +254,10 @@ static int compat_drm_addmap(struct file *file, unsigned int cmd, return -EFAULT; m32.handle = (unsigned long)handle; - if (m32.handle != (unsigned long)handle && printk_ratelimit()) - printk(KERN_ERR "compat_drm_addmap truncated handle" - " %p for type %d offset %x\n", - handle, m32.type, m32.offset); + if (m32.handle != (unsigned long)handle) + printk_ratelimited(KERN_ERR "compat_drm_addmap truncated handle" + " %p for type %d offset %x\n", + handle, m32.type, m32.offset); if (copy_to_user(argp, &m32, sizeof(m32))) return -EFAULT;