From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 15EBAC433F5 for ; Wed, 22 Sep 2021 02:30:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id EF49B610A1 for ; Wed, 22 Sep 2021 02:30:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229825AbhIVCbc (ORCPT ); Tue, 21 Sep 2021 22:31:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbhIVCba (ORCPT ); Tue, 21 Sep 2021 22:31:30 -0400 Received: from out1.migadu.com (out1.migadu.com [IPv6:2001:41d0:2:863f::]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B1BA2C061574 for ; Tue, 21 Sep 2021 19:30:01 -0700 (PDT) Subject: Re: [PATCH v3] mdacon: fix redefinition of 'scr_memsetw' DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1632277798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qSuSnPieUDaOVO6CRq2eMJxdMYKzQp0LFeT47UvdBaA=; b=bHOv9kgYfeLnP/9rouj9kS6ktFMQL8roXXTHoqAVWT8PlGlga2p4uA2PV796StdYlsPOR7 D39DF/4vYaox2QojALbrTzzmrnAC2aO5c4rSZamixdfSpx6eRfLcLhhtNbhDVg1ap1eoV/ WkQNE0CxswZ8qv34f5nkyPsXNTTDoNk= To: dri-devel@lists.freedesktop.org Cc: gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org References: <20210915011354.2669416-1-liu.yun@linux.dev> X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. From: Jackie Liu Message-ID: <73758b4e-50ba-05d1-aa30-1384ee6d1421@linux.dev> Date: Wed, 22 Sep 2021 10:29:52 +0800 MIME-Version: 1.0 In-Reply-To: <20210915011354.2669416-1-liu.yun@linux.dev> Content-Type: text/plain; charset=gbk; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: liu.yun@linux.dev Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ping, would anyone take this patch? ÔÚ 2021/9/15 ÉÏÎç9:13, Jackie Liu дµÀ: > From: Jackie Liu > > CONFIG_VGA_CONSOLE=n and CONFIG_MDA_CONSOLE=n will cause vt_buffer.h not > include . > > But if we set CONFIG_MDA_CONSOLE=m, mdacon.c include > is in front of include . VT_BUF_HAVE_MEMSETW is not defined, > so vt_buffer.h will define a scr_memsetw, after that, vga.h also define > a scr_memsetw, so the repeated definition of scr_memsetw appears, builds > error. > > We only need to make vt_buffer.h also contain vga.h when > CONFIG_MDA_CONSOLE=m. This problem can be fixed. > > BTW, mdacon.c no need to include vga.h forcibly, let vt_buffer.h do it. > > Cc: linux-fbdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: dri-devel@lists.freedesktop.org > Fixes: ac036f9570a2 ("vga: optimise console scrolling") > Reviewed-by: Greg Kroah-Hartman > Signed-off-by: Jackie Liu > --- > drivers/video/console/mdacon.c | 1 - > include/linux/vt_buffer.h | 2 +- > 2 files changed, 1 insertion(+), 2 deletions(-) > > diff --git a/drivers/video/console/mdacon.c b/drivers/video/console/mdacon.c > index ef29b321967f..5898d01bc492 100644 > --- a/drivers/video/console/mdacon.c > +++ b/drivers/video/console/mdacon.c > @@ -42,7 +42,6 @@ > #include > > #include > -#include > > static DEFINE_SPINLOCK(mda_lock); > > diff --git a/include/linux/vt_buffer.h b/include/linux/vt_buffer.h > index 848db1b1569f..3a79cc27a33b 100644 > --- a/include/linux/vt_buffer.h > +++ b/include/linux/vt_buffer.h > @@ -16,7 +16,7 @@ > > #include > > -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_MDA_CONSOLE) > +#if defined(CONFIG_VGA_CONSOLE) || IS_ENABLED(CONFIG_MDA_CONSOLE) > #include > #endif > >