From nobody Wed Jul 20 14:02:12 2022 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 4Lny7S29lwz4X63q; Wed, 20 Jul 2022 14:02:12 +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 4Lny7S1jjKz3bLh; Wed, 20 Jul 2022 14:02:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658325732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ig64+Ltk66pGy4Xslypn/5VX7KknseyRLWEzVO6S+hA=; b=gwBsJym4o1jR5OzYWMNdAJxUbjjbaiv/UvQ6s0fDitj1R7FmnucIX/c2AhnSRglKJpNGDw fuUFcr6nI5lAqAC+X+DAMgcFsi//Cn/W0V/uJ5xplCg4Wu1N3kAswMHPmxpKFaxGkyyfpr Q2n0PzQpGKEFmZW3/r0FcFk75RlT5N53lVfLyxxk0ZP+YHNuwMLcQaDwHk66uP7x+Kqs+W 5rOav7Ae+oGDXB6by9qfZosKIlb3FIbOJfj4NqJWoXQCbzdfzg1nep9cSqAbqxWtnm9Kzt kq0Ejt0JA1HLN2GHaAd7cM3uGjD4EuS8LDOnp1qpYetiQ+jJkMNewGI4j9zIDw== 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 4Lny7S0mjdz1141; Wed, 20 Jul 2022 14:02:12 +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 26KE2C02010012; Wed, 20 Jul 2022 14:02:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26KE2CIP010011; Wed, 20 Jul 2022 14:02:12 GMT (envelope-from git) Date: Wed, 20 Jul 2022 14:02:12 GMT Message-Id: <202207201402.26KE2CIP010011@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: ebaf28a393ab - stable/13 - time: Make realitexpire() local to kern_time.c 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: ebaf28a393ab6658a7151448bb30e98322665db0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1658325732; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ig64+Ltk66pGy4Xslypn/5VX7KknseyRLWEzVO6S+hA=; b=T5vQQngYm7cLi3KDGFsk6+ZdPrWVxG7atT5F63/lozY2WkQixLSBjf1byYw9cDrFa4mkgM Ms8aXNszFnD6C7QF0eCBDEJ+/N1jXI9pH+sv46Ut5PmUPJKLUhz6ceEgyekx1XKJ2KM6kS ECwKSrvGy3tEfohbSIXYtT+LysdgxOiRGzS8J+8PSDqv6SBxKuI7mDuMmR02gXxROYZp4t l6tHERIenpmDJRfG8Xq0EwpExG6iCUK7QVxjl1GPmXtRRMVc7dww6r6movHZgbgd2HYLgu +SkP75oSeI54jln2jMz7qw1c3oDMoGN/+ASWw6IuWCljjSBATxQZvndDMo6RzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1658325732; a=rsa-sha256; cv=none; b=igQtl9ry58HIBeDeDIgPLzwJh3oLx+7ae7GxMexQjGGBC+s9IbUhLAqqgYFJMwFWPk+Tsh M5F6XS1S3bfE5erLr4faZcBCvTdKvDqQvT9BDTvPDmO5lBWsOfY9TKjHov36WyKZqdyNxh 2v0MIb/xFfuS9lQw+jBzK8Z7nkdA21k0QF240kqkKCJ9rlv9gtc7gjqu9wA6dIrsd6/KSu q94pi4ace4aIO9hHhDaskRmgcVWZdayT/x5hX3lDbr+fbPDYRR6+LpJZ5er0Q2TFki3GEg XsIZGMqyom/tC0Ip2WxQXGBKP8hIc2A7e6lnmOiB+tnb2ci4Pc656ttlKFt+YQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=ebaf28a393ab6658a7151448bb30e98322665db0 commit ebaf28a393ab6658a7151448bb30e98322665db0 Author: Mark Johnston AuthorDate: 2022-07-13 13:57:28 +0000 Commit: Mark Johnston CommitDate: 2022-07-20 13:53:31 +0000 time: Make realitexpire() local to kern_time.c Sponsored by: The FreeBSD Foundation (cherry picked from commit ef221ff645322f0ec147c706652744869774e128) --- sys/kern/kern_time.c | 4 +++- sys/sys/systm.h | 2 -- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/kern/kern_time.c b/sys/kern/kern_time.c index aa7060c7cb7f..8b103c6fe729 100644 --- a/sys/kern/kern_time.c +++ b/sys/kern/kern_time.c @@ -108,6 +108,8 @@ static void realtimer_clocktime(clockid_t, struct timespec *); static void realtimer_expire(void *); static void realtimer_expire_l(struct itimer *it, bool proc_locked); +static void realitexpire(void *arg); + static int register_posix_clock(int, const struct kclock *); static void itimer_fire(struct itimer *it); static int itimespecfix(struct timespec *ts); @@ -940,7 +942,7 @@ itimer_proc_continue(struct proc *p) * that here since we want to appear to be in sync with the clock * interrupt even when we're delayed. */ -void +static void realitexpire(void *arg) { struct proc *p; diff --git a/sys/sys/systm.h b/sys/sys/systm.h index 0820bdcde676..b2b84d0fc722 100644 --- a/sys/sys/systm.h +++ b/sys/sys/systm.h @@ -338,8 +338,6 @@ int casueword32(volatile uint32_t *base, uint32_t oldval, uint32_t *oldvalp, int casueword(volatile u_long *p, u_long oldval, u_long *oldvalp, u_long newval); -void realitexpire(void *); - int sysbeep(int hertz, sbintime_t duration); void hardclock(int cnt, int usermode);