From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: Re: [PATCH 2/7] drm/vmwgfx: fix a problematic usage of WARN_ON() Date: Thu, 26 Nov 2015 15:51:22 +0100 Message-ID: <56571C6A.1030606@vmware.com> References: <86c73f180d3054c1bf17bdac8c89026209167c9b.1448456395.git.geliangtang@163.com> <8bb789c0803579a01e1ee977ed67408c422acd79.1448456395.git.geliangtang@163.com> Mime-Version: 1.0 Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <8bb789c0803579a01e1ee977ed67408c422acd79.1448456395.git.geliangtang@163.com> Sender: linux-kernel-owner@vger.kernel.org To: Geliang Tang , David Airlie , Sinclair Yeh , Charmaine Lee Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org Thanks for reporting! This fix was already reported by Dan Carpenter and has already been queued in vmwgfx-fixes-4.4 /Thomas On 11/25/2015 02:12 PM, Geliang Tang wrote: > WARN_ON() takes a condition rather than a format string. This patch > converted WARN_ON() to WARN() instead. > > Signed-off-by: Geliang Tang > --- > drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c > index a8baf5f..b6a0806 100644 > --- a/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c > +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c > @@ -390,7 +390,7 @@ void *vmw_fifo_reserve_dx(struct vmw_private *dev_priv, uint32_t bytes, > else if (ctx_id == SVGA3D_INVALID_ID) > ret = vmw_local_fifo_reserve(dev_priv, bytes); > else { > - WARN_ON("Command buffer has not been allocated.\n"); > + WARN(1, "Command buffer has not been allocated.\n"); > ret = NULL; > } > if (IS_ERR_OR_NULL(ret)) {