From nobody Mon Nov 22 13:46:25 2021 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 132A618A1329; Mon, 22 Nov 2021 13:46:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HyT826z5Lz3lc4; Mon, 22 Nov 2021 13:46:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B2DBA23C13; Mon, 22 Nov 2021 13:46:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AMDkPIR037609; Mon, 22 Nov 2021 13:46:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMDkPrW037608; Mon, 22 Nov 2021 13:46:25 GMT (envelope-from git) Date: Mon, 22 Nov 2021 13:46:25 GMT Message-Id: <202111221346.1AMDkPrW037608@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: d16fbc488e60 - stable/13 - clock: Group the "clocks" SYSINIT with the function definition List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d16fbc488e604d5bad295c2951aa67da885a62f5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d16fbc488e604d5bad295c2951aa67da885a62f5 commit d16fbc488e604d5bad295c2951aa67da885a62f5 Author: Mark Johnston AuthorDate: 2021-11-15 20:31:03 +0000 Commit: Mark Johnston CommitDate: 2021-11-22 13:45:47 +0000 clock: Group the "clocks" SYSINIT with the function definition This is how most SYSINITs are defined. Also annotate the dummy parameter with __unused. No functional change intended. Sponsored by: The FreeBSD Foundation (cherry picked from commit 2287ced2f5686aeda69676342d6a1ff6257f5f6d) --- sys/kern/kern_clock.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c index c215471ab2d9..3998ffd2a607 100644 --- a/sys/kern/kern_clock.c +++ b/sys/kern/kern_clock.c @@ -90,9 +90,6 @@ PMC_SOFT_DEFINE_EX( , , clock, prof, \ extern void hardclock_device_poll(void); #endif /* DEVICE_POLLING */ -static void initclocks(void *dummy); -SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL); - /* Spin-lock protecting profiling statistics. */ static struct mtx time_lock; @@ -391,9 +388,8 @@ static int devpoll_run = 0; /* * Initialize clock frequencies and start both clocks running. */ -/* ARGSUSED*/ static void -initclocks(void *dummy) +initclocks(void *dummy __unused) { int i; @@ -421,6 +417,7 @@ initclocks(void *dummy) wdog_software_attach = watchdog_attach; #endif } +SYSINIT(clocks, SI_SUB_CLOCKS, SI_ORDER_FIRST, initclocks, NULL); static __noinline void hardclock_itimer(struct thread *td, struct pstats *pstats, int cnt, int usermode)