From patchwork Tue Feb 7 18:31:38 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: 54042 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3014449wrn; Tue, 7 Feb 2023 10:44:22 -0800 (PST) X-Google-Smtp-Source: AK7set/eHb3jd5efe9rRnwXW8E3pCC20jFfudL/22XgUXt0EoOZVOc0Cpn1EOZGArl/Ty4pl59II X-Received: by 2002:a17:907:6d8a:b0:88f:8a5:b4cd with SMTP id sb10-20020a1709076d8a00b0088f08a5b4cdmr5890149ejc.1.1675795462284; Tue, 07 Feb 2023 10:44:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675795462; cv=none; d=google.com; s=arc-20160816; b=Na3e2D5fKUXgs/HTCzJF49ALivmaLc623QmZufwfEwC/s5F1lhO00FTPUOOCUl1cjE PSY3QI5C2hLQvA12wHz12+kbcSVoZxzLAsE1VVRJGFVZBrLuePr3ZsdUr+bQTqycHnvK 5+Rjj/75mBxkMbylmB6ZI1Fx3urWkGKzwFXIWTRQya23pg+1JydlH3vAihuFFe1ZD3QC mc8ucpdcQM+xTgB6Xyyo8ddWdIvRPz1jhhrjdAPLQV1CRZB0FtHkL98tzi1kQIwWA0ha pJ57k3Ukwyjbb9Ii/Y+gLfmGXQnf9u90NP0oOzft3XEf7A7ZRIF16r4qwJ8f1A3P+kPH yJjw== 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=g9bCm+6iKVhDzLDQh5XmZaZrHINE5HUt57TMySLUnQY=; b=BUWMZbwsVGZ15jYo/iAUafYR1jh9xscmuDBkBJIm9lEdIdtYJzkxymCrFzocSFuVb2 2QU7QsZKLuNZCgnmgnwqZrLBqR1A9OdfM4V3JDYZNtY9PuP3swtLiRhjCqw93f7dFtlt h9COTBPS2JOEEQRKzFKeg8/MiDheXGex6iUjlZgi14zw+zNaPMXptclL4Z+UQF7NTIcz FoFu6HO4X0OKn23GGnmTY8sZ1l7wqtC+qc1/usRd6O7tNssamkdds2GgQ2Cu3otzxNiL +Hg5AhZThrH+HaeN/nusqy0rWaFcKBYlXtfYDWH08+S1o55vDxzTJJPGBcCcmYGj4cgX dUNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=OO9FpvVy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="z+aHs+T/"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 22-20020a170906015600b008875216c082si13768712ejh.374.2023.02.07.10.43.59; Tue, 07 Feb 2023 10:44:22 -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=@linutronix.de header.s=2020 header.b=OO9FpvVy; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b="z+aHs+T/"; 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; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232411AbjBGSbx (ORCPT + 99 others); Tue, 7 Feb 2023 13:31:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232492AbjBGSbt (ORCPT ); Tue, 7 Feb 2023 13:31:49 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B737B3E09B; Tue, 7 Feb 2023 10:31:40 -0800 (PST) Date: Tue, 07 Feb 2023 18:31:38 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1675794699; 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=g9bCm+6iKVhDzLDQh5XmZaZrHINE5HUt57TMySLUnQY=; b=OO9FpvVyyvTtTeR6MaQn4b//o80LXJ3O4Iv5rGmkhAJs7HM3hoYVegY+rxas2WW4FOenHq XeCK4hevkFhvo1HqBCmZexZuCdsPHSfX11jrRIcItXHSmeoGDwLRZnWt7nBaJw+wy+AB7i zyfQN9VCGMNb/SSFaJmEIta9CNqkPrbChMGMdE0oMTBH1LU74qA4zuczB+G6skvKvKGJhF /Au5VgmNbnJlPNVmYV8/YCuYuA5GhI8C7PBe7V5Z6PKPwKbm9Zz5P+1Yr5jSWzEwdueEre msKTxlKczPxWh7azdnRjlPpnSQKJ8TKS/KTjzofz3mNyubbGhP42tz06xu1Gmw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1675794699; 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=g9bCm+6iKVhDzLDQh5XmZaZrHINE5HUt57TMySLUnQY=; b=z+aHs+T/Ta/86ESuxdXh/ukeG9vHG1sa6Jp2dr08qYrKLKkMgOfxqaZJ4leJu7MxLHhddK 2aQuUPuKdzXAvYBA== From: "tip-bot2 for Borislav Petkov (AMD)" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/vdso] x86/vdso: Fix -Wmissing-prototypes warnings Cc: kernel test robot , "Borislav Petkov (AMD)" , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <202302070742.iYcnoJwk-lkp@intel.com> References: <202302070742.iYcnoJwk-lkp@intel.com> MIME-Version: 1.0 Message-ID: <167579469826.4906.1882516265685994388.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, 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?1757198902514121447?= X-GMAIL-MSGID: =?utf-8?q?1757198902514121447?= The following commit has been merged into the x86/vdso branch of tip: Commit-ID: dac0da428f8dfb23666ab4ea54a7768c152b857a Gitweb: https://git.kernel.org/tip/dac0da428f8dfb23666ab4ea54a7768c152b857a Author: Borislav Petkov (AMD) AuthorDate: Tue, 07 Feb 2023 16:13:24 +01:00 Committer: Borislav Petkov (AMD) CommitterDate: Tue, 07 Feb 2023 18:23:17 +01:00 x86/vdso: Fix -Wmissing-prototypes warnings Fix those: In file included from arch/x86/entry/vdso/vdso32/vclock_gettime.c:4: arch/x86/entry/vdso/vdso32/../vclock_gettime.c:70:5: warning: no previous prototype for ‘__vdso_clock_gettime64’ [-Wmissing-prototypes] 70 | int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts) | In file included from arch/x86/entry/vdso/vdso32/vgetcpu.c:3: arch/x86/entry/vdso/vdso32/../vgetcpu.c:13:1: warning: no previous prototype for ‘__vdso_getcpu’ [-Wmissing-prototypes] 13 | __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused) | ^~~~~~~~~~~~~ Reported-by: kernel test robot Signed-off-by: Borislav Petkov (AMD) Link: https://lore.kernel.org/r/202302070742.iYcnoJwk-lkp@intel.com --- arch/x86/include/asm/vdso/gettimeofday.h | 2 ++ arch/x86/include/asm/vdso/processor.h | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/include/asm/vdso/gettimeofday.h b/arch/x86/include/asm/vdso/gettimeofday.h index 1936f21..4cf6794 100644 --- a/arch/x86/include/asm/vdso/gettimeofday.h +++ b/arch/x86/include/asm/vdso/gettimeofday.h @@ -318,6 +318,8 @@ u64 vdso_calc_delta(u64 cycles, u64 last, u64 mask, u32 mult) } #define vdso_calc_delta vdso_calc_delta +int __vdso_clock_gettime64(clockid_t clock, struct __kernel_timespec *ts); + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_VDSO_GETTIMEOFDAY_H */ diff --git a/arch/x86/include/asm/vdso/processor.h b/arch/x86/include/asm/vdso/processor.h index 57b1a70..2cbce97 100644 --- a/arch/x86/include/asm/vdso/processor.h +++ b/arch/x86/include/asm/vdso/processor.h @@ -18,6 +18,10 @@ static __always_inline void cpu_relax(void) rep_nop(); } +struct getcpu_cache; + +notrace long __vdso_getcpu(unsigned *cpu, unsigned *node, struct getcpu_cache *unused); + #endif /* __ASSEMBLY__ */ #endif /* __ASM_VDSO_PROCESSOR_H */