From patchwork Thu Nov 17 07:32:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 21486 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp262224wrr; Wed, 16 Nov 2022 23:36:41 -0800 (PST) X-Google-Smtp-Source: AA0mqf64Yd3BWhsOSsiiA3pV3gCJy5/n1Gyg6o35D/PSEDefAPWbaDynayPdadubJL3aKk3IZ/W/ X-Received: by 2002:a17:90b:2744:b0:218:7675:ba83 with SMTP id qi4-20020a17090b274400b002187675ba83mr1098313pjb.61.1668670601148; Wed, 16 Nov 2022 23:36:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668670601; cv=none; d=google.com; s=arc-20160816; b=AMw6aovlni5Ebh9yLHJolNbHNH3LTorPQn0UDSuKfhtV7ihJ/B3n9Q6UH7np0MwWOQ i34NO7VXi1GRj9eQa+jI6jAa01wKynxm9KZLyGHrQrlIR/X5rNt6DmsRFAx/Gcg3LzTM 1e+d++jT4ntUUQg9HRMRhzf/wleob5sm2ZVE2Bb6h3RVCASLdNOlfEHQqOmtIymVqol4 JXYs8ykn06Hjd+rEIT5y6LbI6bT8IziLdXNXC/yNxuDVFCPccW9U185yinYs5G54V3oK tYUHgCkXtKAhh6EpJP9VT0ejBc5llI2S/pMDGrkSZMzoaTzbmW7nLU+jZEN/6lkKEedS RI6Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=q0FbdAqaG0HNIjHKwNowfghEhjynAez7A03pBstoQU0=; b=RJfMlTbNtBcx5lnlYIXL9R0IY1+CZ4jLduDHv2uSIIZm3AiK0k0vaZXcNpo8ygncJn H1A9YK+TpdFCDcA673VpNQoZU/ZkFRMdVCk7V0U5woKcK3W4lK/2v13IBzMNwWUmJNY4 z8zqgj1ygMmMrIKrhTGrzaJBno/v2ZhRtarEWEGU+cxyYs+dyA8Jff4UAsfaxkESyng+ iaJrRpe233y+CTKVDHm9oaULxNHwrGZ15+gB/18XWq0uMPIz4qNZRFHg8Sx1gtJo/Wl6 QXsZPEf0emVWsL6lTq8dHzB/hIxu6FyWntdpDxUw8QfY8IJO0Qfro5GrFsQZXhFxlCZf vArA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KhymOuqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nm16-20020a17090b19d000b00212d63cd243si3639491pjb.109.2022.11.16.23.36.26; Wed, 16 Nov 2022 23:36:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=KhymOuqA; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239362AbiKQHcY (ORCPT + 99 others); Thu, 17 Nov 2022 02:32:24 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34918 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239318AbiKQHcX (ORCPT ); Thu, 17 Nov 2022 02:32:23 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 56B645E9F2; Wed, 16 Nov 2022 23:32:21 -0800 (PST) Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NCWp96HpFz4xGH; Thu, 17 Nov 2022 18:32:17 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1668670339; bh=q0FbdAqaG0HNIjHKwNowfghEhjynAez7A03pBstoQU0=; h=Date:From:To:Cc:Subject:From; b=KhymOuqAGJV6FLwllpoWvdHL3c6MPLTEPt6wzaRAARKGgKnZC1vPW8zU+8yfuorhg kLhWjuukYjimYj9XUz3EpMO8+wvSziCXSVI1/CZZC3+QEnkrogBkwV/Lc8kaO4mODp OGOdnkNSZHS/40YQF7Jb41P51BjHuluYhT8x0rGG0y4XXWQOopjjHGmuvaYFqbQAMs awFoU/CbewKhxjgTWc1Vh65i+CIkVrJZ8c0OOl8pdm9xqeAd+C4Zur1Q0Cj+EW081B 3rnPWpZizIf5R0zG+3D3/jlOS+7VGmyLH2Zl0OvtI+rIX13m6Kw3FOJFWQ7tLZeNhk E7ooCiVbw9uSw== Date: Thu, 17 Nov 2022 18:32:14 +1100 From: Stephen Rothwell To: Daniel Vetter Cc: Thomas Zimmermann , Intel Graphics , DRI , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the drm-misc tree Message-ID: <20221117183214.2473e745@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749727943877034955?= X-GMAIL-MSGID: =?utf-8?q?1749727943877034955?= Hi all, After merging the drm-misc tree, today's linux-next build (powerpc ppc44x_defconfig) failed like this: ld: drivers/video/fbdev/core/fbmon.o: in function `fb_modesetting_disabled': fbmon.c:(.text+0x1e4): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbcmap.o: in function `fb_modesetting_disabled': fbcmap.c:(.text+0x478): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbsysfs.o: in function `fb_modesetting_disabled': fbsysfs.c:(.text+0xb64): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/modedb.o: in function `fb_modesetting_disabled': modedb.c:(.text+0x129c): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here ld: drivers/video/fbdev/core/fbcvt.o: in function `fb_modesetting_disabled': fbcvt.c:(.text+0x0): multiple definition of `fb_modesetting_disabled'; drivers/video/fbdev/core/fbmem.o:fbmem.c:(.text+0x1bac): first defined here Caused by commit 0ba2fa8cbd29 ("fbdev: Add support for the nomodeset kernel parameter") This build does not have CONFIG_VIDEO_NOMODESET set. I applied the following patch for today. From 63f957a050c62478ed1348c5b204bc65c68df4d7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 17 Nov 2022 18:19:22 +1100 Subject: [PATCH] fix up for "fbdev: Add support for the nomodeset kernel parameter" Signed-off-by: Stephen Rothwell --- include/linux/fb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/fb.h b/include/linux/fb.h index 3a822e4357b1..ea421724f733 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -807,7 +807,7 @@ extern int fb_find_mode(struct fb_var_screeninfo *var, #if defined(CONFIG_VIDEO_NOMODESET) bool fb_modesetting_disabled(const char *drvname); #else -bool fb_modesetting_disabled(const char *drvname) +static inline bool fb_modesetting_disabled(const char *drvname) { return false; }