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=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, 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=ham 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 D9EDAC433EF for ; Tue, 14 Sep 2021 14:52:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BF996610A6 for ; Tue, 14 Sep 2021 14:52:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234146AbhINOx2 (ORCPT ); Tue, 14 Sep 2021 10:53:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:43358 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233309AbhINOx1 (ORCPT ); Tue, 14 Sep 2021 10:53:27 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44F4760FD7; Tue, 14 Sep 2021 14:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1631631129; bh=Y+WZnwZuFQFsEIab6A5HpdFBYcNOEYbJDOHV6UOEYcc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=TRSjj/o38HtRm4I3MwadxstUKa903ijAhzeepfzozjzA/mXS8+JgMXp3XHPoUicpS 8hx0Wv5LlKQpOBhIzI5eegcAyTb7dxxkWMkGHBzfb5eenN9ycGpDbo0OZuALc9HJp4 58pkQVfmzstZwbcC6M6aCtt92B6fQqpHrgo5y1UM= Date: Tue, 14 Sep 2021 16:52:07 +0200 From: Greg KH To: Jackie Liu Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH v2] mdacon: fix redefinition of 'scr_memsetw' Message-ID: References: <20210907020326.2329486-1-liu.yun@linux.dev> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210907020326.2329486-1-liu.yun@linux.dev> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Sep 07, 2021 at 10:03:26AM +0800, Jackie Liu wrote: > 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. > > Fixes: ac036f9570a2 ("vga: optimise console scrolling") > Cc: Greg Kroah-Hartman > Cc: linux-fbdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > 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 > > -- > 2.25.1 > Reviewed-by: Greg Kroah-Hartman This needs to go through the dri-devel mailing list, please resubmit it with my reviewed-by on it. thanks, greg k-h