From patchwork Wed Nov 22 13:19:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 168366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1316404vqb; Wed, 22 Nov 2023 05:19:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IGqwTbn9BvgU8D6OdwXr5im+1wJWbW+PSdbzLsn6/pyysf2FYp20eQz+y46XTUgsHjd8M/w X-Received: by 2002:a05:6a20:7343:b0:187:8d7a:76e8 with SMTP id v3-20020a056a20734300b001878d7a76e8mr2221088pzc.16.1700659173580; Wed, 22 Nov 2023 05:19:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700659173; cv=none; d=google.com; s=arc-20160816; b=WfIKdikpXeFXf+cpE5F8gfrykL7bo2cGhkKVg0sMxApJEfUdTaEm4ApbB522A2uc53 bHCOeiKMKAC58PFpWCxxmJTk77iXIl4kx4sJl++Zkw628YJXFow6ij2HDYY9EVjVV4Xo o4J1xbEjqqFqOWJLwfAjwbtG2WnXBLQXj6KnIQjECGclsbu5Id08RqkctTlVDGosnIDw rDGKG8mdDLe3E6yyNPWrFLZYgNtJ4Sjl5ZUnrhvhYEjrNhT+zfTO5k2wAStqajK+wLRR 95koMXNLcwPoslEJn/VJAFLmz/TfOmcXLXSV8zwWWeu5ox8ZSfDe0vV+UcaDvjoiEUrh bDKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=fojc2VGWk1Ppqi8igArbeVREM67+3gzH2X7O+KyEs7k=; fh=dpx/uRdHYmkMTJx7AtXeDxHt80GlBV5eqRlP+OoJtCo=; b=lyTx/5sViwrdX84DQNxo155xe2MetYufOM2lztQVEdg1WgAhWHRnCFu1UeLQvbb9LJ eH/JUbePF8jgBMmEsIllLQrxeQdZVifnYqdX89iFPx/SJ8nIbMK0JBNYF+Fu4WVDRq5M e+H7IJFiiAG4xNIEiZIpLpPW5MHOq9PixvpMKlGmDHe/auFyEyrbiUqRotIluFTS97L4 T8RQ5hs/Etemb8vrBR/wbuEZySJyB8VyCWNXzQGven6wqE3T4R1MDgLGA+C3tXbkKIkk GKsSZFz+vp+G6wFTuYRcnHoTt9G9bxEjuNl8LLSKG2vNMX0x1N+eaQev0q/5t+xo6WOO BKOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FjIv3wsB; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id y23-20020a056a00181700b006cb8489ce1csi7842869pfa.54.2023.11.22.05.19.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 22 Nov 2023 05:19:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=FjIv3wsB; dkim=neutral (no key) header.i=@linutronix.de; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id E8D6D820D5CA; Wed, 22 Nov 2023 05:19:29 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344082AbjKVNTZ (ORCPT + 99 others); Wed, 22 Nov 2023 08:19:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343961AbjKVNTY (ORCPT ); Wed, 22 Nov 2023 08:19:24 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0FDC9191; Wed, 22 Nov 2023 05:19:21 -0800 (PST) Date: Wed, 22 Nov 2023 13:19:17 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1700659158; h=from:from:sender:sender:reply-to: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=fojc2VGWk1Ppqi8igArbeVREM67+3gzH2X7O+KyEs7k=; b=FjIv3wsBdmz322hgPdMxAW+a5y4fN/TVKc+BWVWixWsXrZUI4rWFAPupAWIYjzLtCsrA+Z blS6cNGTXxEuexwvSf4S1FXU6DrigqkAqGH0kgAOSv3ggGWq7xeAcBFOqPG35ya0MmQ9NZ 0Zbz/hr0NmuBfavLXlPYIoWBs17POcov/7AKO0GlCpwctjplIIOFpDdADRPDDbmwf/2QL2 2qeyj/6GnGJE98RhQsh2VS1Pge+JmuDQeFcPeOOehYs6wMyHNI03NiZtAPG41gY4WFDN1X AW0D4E1hufW+hGbcJ9GKFOp+Evbk02OyIKKqC1bJvcjk7lPDKoxKJB0rAtUu4g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1700659158; h=from:from:sender:sender:reply-to: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=fojc2VGWk1Ppqi8igArbeVREM67+3gzH2X7O+KyEs7k=; b=zd2H1Kgc54bbiw4/o7TA002G2AAU8tVmRos8O//v1EqEM/STHsUgKCQcVNFfB45Ue/uKV3 4iaOo39zXxdU4yBw== From: "tip-bot2 for Arnd Bergmann" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/core] time: Make sysfs_get_uname() function visible in header Cc: Arnd Bergmann , Thomas Gleixner , u.kleine-koenig@pengutronix.de, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20231108125843.3806765-5-arnd@kernel.org> References: <20231108125843.3806765-5-arnd@kernel.org> MIME-Version: 1.0 Message-ID: <170065915799.398.1839657355059760928.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,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 lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Wed, 22 Nov 2023 05:19:30 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783270393744721534 X-GMAIL-MSGID: 1783270393744721534 The following commit has been merged into the timers/core branch of tip: Commit-ID: a89299c40911ee29c6ec4fb66f9c598cd947265b Gitweb: https://git.kernel.org/tip/a89299c40911ee29c6ec4fb66f9c598cd947265b Author: Arnd Bergmann AuthorDate: Wed, 08 Nov 2023 13:58:25 +01:00 Committer: Thomas Gleixner CommitterDate: Wed, 22 Nov 2023 14:12:10 +01:00 time: Make sysfs_get_uname() function visible in header This function is defined globally in clocksource.c and used conditionally in clockevent.c, which the declaration hidden when clockevent support is disabled. This causes a harmless warning in the definition: kernel/time/clocksource.c:1324:9: warning: no previous prototype for 'sysfs_get_uname' [-Wmissing-prototypes] 1324 | ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt) Move the declaration out of the #ifdef so it is always visible. Signed-off-by: Arnd Bergmann Signed-off-by: Thomas Gleixner Reviewed-by: Uwe Kleine-König Link: https://lore.kernel.org/r/20231108125843.3806765-5-arnd@kernel.org --- kernel/time/tick-internal.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index 649f2b4..481b7ab 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h @@ -56,7 +56,6 @@ extern int clockevents_program_event(struct clock_event_device *dev, ktime_t expires, bool force); extern void clockevents_handle_noop(struct clock_event_device *dev); extern int __clockevents_update_freq(struct clock_event_device *dev, u32 freq); -extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt); /* Broadcasting support */ # ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST @@ -197,3 +196,5 @@ void hrtimers_resume_local(void); #else #define JIFFIES_SHIFT 8 #endif + +extern ssize_t sysfs_get_uname(const char *buf, char *dst, size_t cnt);