Received: by 2002:a05:6a10:1a4d:0:0:0:0 with SMTP id nk13csp1529530pxb; Tue, 8 Feb 2022 21:13:50 -0800 (PST) X-Google-Smtp-Source: ABdhPJymdFFtmcxbYPACzL5XfBMMUtKP22x4sswcDbYL+iiPXwRz+x9zaoUb1uXNYczuKXpFFplp X-Received: by 2002:a17:90b:1d0e:: with SMTP id on14mr1537147pjb.59.1644383630147; Tue, 08 Feb 2022 21:13:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1644383630; cv=none; d=google.com; s=arc-20160816; b=ApSVnMiYdj1qcPShXIXy3HG/hfxaSZMhoZVPsSNn5l/lWNLtVewngfYbgsJOPUiAnk WeEipvSLHbIOr6p9wGMw8DFr8y2zQYrTjA1juaizHpUvmINdef9BikXCYkksFjFJJorf aoX4rwwLgCfdH04YQa/6nMAGa2LnNPw2QvDAUO0DDnCxg0fGfBo3hiIifJl4fkqPR409 RgP3W0/mLcbN2o5cIx9f5RvLt6R6FSLJEPt7hH00jfcRrV15tnzRKIg/RiuBgovWMp5H 8rj2corD7ksF2Wvr4MMzwn3swbUH36VVRKWyh7pPrZ7eN/4wtYUPn5uHczecDsIKE01k H2zA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4RkUIVbtXWLMhEgVRprjRhLI7qLO2cMyCi+EhjvzZFw=; b=gHL56cKdSteqC6hh63WnAY3wG+Nk7MrdyXAJLeDau+eJdnxXB2HOQmoASOsnbzLNUs 7DdLQYP/hDacVzJCyJA1vG2iMsg4lXVCTLu5hNN6Zy1oOZw6HHiUHBmmYN/Abt42SKSk QTcw7CUPKenO7xk6wVBvJontPTYCj9cZGEyj3kTHEvHLeOVbleWLDVmg1CBHdgjjIDYu MrkdgS3hiWY193CAJWagEVXuONtB36O8X0FxeSVaIuZVpwqFnsJQVgp3/85XUlOYdC2g eA6s30DzQG9g+0+fRHW7T/oZsfQ7CSgmjYsT/xOB0ReZG+YY1O+JB8A66N20sYDRvjfP sAsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=hTk5ijDH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id w24si13717672pll.11.2022.02.08.21.13.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 21:13:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@ffwll.ch header.s=google header.b=hTk5ijDH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 8FB36C03C1A9; Tue, 8 Feb 2022 21:13:44 -0800 (PST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1388389AbiBHWcr (ORCPT + 99 others); Tue, 8 Feb 2022 17:32:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1386761AbiBHVJB (ORCPT ); Tue, 8 Feb 2022 16:09:01 -0500 Received: from mail-wr1-x430.google.com (mail-wr1-x430.google.com [IPv6:2a00:1450:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E272CC0612BA for ; Tue, 8 Feb 2022 13:08:59 -0800 (PST) Received: by mail-wr1-x430.google.com with SMTP id s10so591985wra.5 for ; Tue, 08 Feb 2022 13:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=4RkUIVbtXWLMhEgVRprjRhLI7qLO2cMyCi+EhjvzZFw=; b=hTk5ijDHDMgQxKkA9BUrH0F2len3i2uKxb473Xdpw5iK2wSxC9XmwvSbp7bYW0PLPk QbKh5k1BSr/Tz0jA06DfQZya1UO90srY53nLsu9F38wakMDiTM36Bhv99fd2QZrbuYGF DdQESgBxjgKfPc9w3F9JFaETCMViCRldl1gyk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4RkUIVbtXWLMhEgVRprjRhLI7qLO2cMyCi+EhjvzZFw=; b=sTE7lEPAJDIwnYV3XDbOy/1Jpc17/xIE0Avl6gGv0EwGdfED9sh00K+Y2W4Id7xXKV 8Z93lp9s/hQwoPKxgCCWLkZLaxy8X55xwV4HCyUw9CEh9VlFKU6JJwNle3Jv0Yj8XUHc 57JXFTzyV/xQjPnUHsnKmOk659oev1Pu4vf1X0nHOmoP7/JDsucU2bMY9bZqPs1ltYwT sqGZQi8pO0AEUslwBjhm544RIzGfncjkT4I/jwGOEfIfdwNc6OWCJnkgxnjJ9MbhZuF6 cR9GQ6mnHATuu2nSs7FQXxgsfYqpoUdXS/rYnS/fTKAjDhtAUSW/OELYpqhqDMsw3A6e A+CA== X-Gm-Message-State: AOAM532GwZX4Kryph144/mWE7QBcdQ/aElVUfwE+DijyhdYSQuMutP6o PO4LLnpFCA8krKi5raYvdAb0BQ== X-Received: by 2002:a5d:47af:: with SMTP id 15mr5049471wrb.88.1644354538519; Tue, 08 Feb 2022 13:08:58 -0800 (PST) Received: from phenom.ffwll.local ([2a02:168:57f4:0:efd0:b9e5:5ae6:c2fa]) by smtp.gmail.com with ESMTPSA id o14sm3033561wmr.3.2022.02.08.13.08.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Feb 2022 13:08:58 -0800 (PST) From: Daniel Vetter To: DRI Development Cc: Intel Graphics Development , linux-fbdev@vger.kernel.org, LKML , Daniel Vetter , kernel test robot , Jens Frederich , Jon Nettleton , Greg Kroah-Hartman , linux-staging@lists.linux.dev, Daniel Vetter , Daniel Vetter , Helge Deller , Matthew Wilcox , Sam Ravnborg , Tetsuo Handa , Zhen Lei , Alex Deucher , Xiyu Yang , Zheyu Ma , Guenter Roeck Subject: [PATCH v2 19/19] fbdev: Make registered_fb[] private to fbmem.c Date: Tue, 8 Feb 2022 22:08:24 +0100 Message-Id: <20220208210824.2238981-20-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220208210824.2238981-1-daniel.vetter@ffwll.ch> References: <20220208210824.2238981-1-daniel.vetter@ffwll.ch> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE autolearn=unavailable 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 Well except when the olpc dcon fbdev driver is enabled, that thing digs around in there in rather unfixable ways. Cc oldc_dcon maintainers as fyi. v2: I typoed the config name (0day) Cc: kernel test robot Cc: Jens Frederich Cc: Jon Nettleton Cc: Greg Kroah-Hartman Cc: linux-staging@lists.linux.dev Signed-off-by: Daniel Vetter Cc: Daniel Vetter Cc: Helge Deller Cc: Matthew Wilcox Cc: Sam Ravnborg Cc: Tetsuo Handa Cc: Zhen Lei Cc: Alex Deucher Cc: Xiyu Yang Cc: linux-fbdev@vger.kernel.org Cc: Zheyu Ma Cc: Guenter Roeck --- drivers/video/fbdev/core/fbmem.c | 8 ++++++-- include/linux/fb.h | 7 +++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/video/fbdev/core/fbmem.c b/drivers/video/fbdev/core/fbmem.c index 6f6f7a763969..6f0eb596a2cd 100644 --- a/drivers/video/fbdev/core/fbmem.c +++ b/drivers/video/fbdev/core/fbmem.c @@ -49,10 +49,14 @@ static DEFINE_MUTEX(registration_lock); struct fb_info *registered_fb[FB_MAX] __read_mostly; -EXPORT_SYMBOL(registered_fb); - int num_registered_fb __read_mostly; +#if IS_ENABLED(CONFIG_FB_OLPC_DCON) +EXPORT_SYMBOL(registered_fb); EXPORT_SYMBOL(num_registered_fb); +#endif +#define for_each_registered_fb(i) \ + for (i = 0; i < FB_MAX; i++) \ + if (!registered_fb[i]) {} else bool fb_center_logo __read_mostly; diff --git a/include/linux/fb.h b/include/linux/fb.h index 23b19cf8bccd..afaa1474a283 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -623,16 +623,15 @@ extern int fb_get_color_depth(struct fb_var_screeninfo *var, extern int fb_get_options(const char *name, char **option); extern int fb_new_modelist(struct fb_info *info); +#if IS_ENABLED(CONFIG_FB_OLPC_DCON) extern struct fb_info *registered_fb[FB_MAX]; + extern int num_registered_fb; +#endif extern bool fb_center_logo; extern int fb_logo_count; extern struct class *fb_class; -#define for_each_registered_fb(i) \ - for (i = 0; i < FB_MAX; i++) \ - if (!registered_fb[i]) {} else - static inline void lock_fb_info(struct fb_info *info) { mutex_lock(&info->lock); -- 2.34.1