From nobody Mon Apr 08 19:04:23 2024 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 4VCz6J37djz5HYgq; Mon, 8 Apr 2024 19:04:24 +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 4VCz6J0rLvz4gJf; Mon, 8 Apr 2024 19:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603064; 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=Xa6Zz3qOukf+CAbIbKE7q4oSSHi5iwQtocD8+qZC9n4=; b=Ltqj05ulIA688edTp5kF9e/C0HMvbtxEhtwZ72HgiLwNB2SsYwJgcjSQYCdxaGAyO1Wuu8 Oma5G9fs8wLOSEpvUjh1cV2CwPazbuTI0Ql26jVrjguUpIkpjlk5F3wlbyvBooFYqwkZ3X qFMz0TgMgv80N8Yf0OCOsRNH5ejAjI/s3n6us53OopWt1XmgguknHe/WKKbgiMJycVdquN cP2kDdCW2YLqj28ny9L/FgcO83NWCxX5C+wwtr3jlctAyHXqwD/O7iRpUDgaEevemb5Ab2 FBmDAJAK/4Ezl2QZ1JqkSBWPvww3CdRfUGxytFAoy27gqxpb+RJ0bie27IL9ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1712603064; a=rsa-sha256; cv=none; b=Zmm/fmUpZkJMkwfly9PpwvvJodcwLvWdeIlOnJhztgK4/bhJhlxSklFn+QPdfSKNLXz0zt iSwuboR6UoZ9zJfzf9526U9So0g/rsRVQsugPxAe4uFupzXdEoND74dw2RRMCItWy2F3W8 Pydw76VRtWPfLjt9ttDsEmJ3ctw3xOkLrG/foS9nq/GXWIl5wkXWz9jhiB+paBNG8qscES xdpnzsRkSv+8ntKwicnQ9oZicw7XASKZqeYEcjPz2JSjqGxlWSdSrpt5ps5EVaHbIBVURk 9TeDbhXyqCE39ElPWsUMwmO0MNDna8VNhuQ90roBEzBUqOdBPHXqVA5IEBZY7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1712603064; 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=Xa6Zz3qOukf+CAbIbKE7q4oSSHi5iwQtocD8+qZC9n4=; b=tGVlFDpIGEmuSCuvkf76dtlcKgPax8ZM4eSNtYW9JfhGzWPYUpVD2RCkZchBfflmEyhmki 9B04sN0/dOIGA/c/kL2TXOeUjzU7KhqJPwIXDCJDes3ckXgthP3ZOI1kF8g80Wn9plOsgw Zb2THb+8tZjX5BXQJMn3JxWUO5YGoIK6KudfhsaeeIgOfHCza8p4hN22f9LrQVtQiUGpqO fRyzB1ow3M/1SGVTHUhJpvJPXNK5DzinPhKyad/uZtNh7DE7Y+PfZtYCxXAAuSMU+dZbs6 rwc2SG9q7NGdNN+TxALTZTuAiIS1dWl+PXVQj4TiOPC1I8yntuSWxmahF74ASA== 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 4VCz6J0DvczNdh; Mon, 8 Apr 2024 19:04:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 438J4NgZ094004; Mon, 8 Apr 2024 19:04:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 438J4Nfl094001; Mon, 8 Apr 2024 19:04:23 GMT (envelope-from git) Date: Mon, 8 Apr 2024 19:04:23 GMT Message-Id: <202404081904.438J4Nfl094001@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: bf5387a9367e - stable/14 - timerfd: Move kern_timerfd_* prototypes to 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bf5387a9367e2654d3d014277e4ca3135a9cc6df Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=bf5387a9367e2654d3d014277e4ca3135a9cc6df commit bf5387a9367e2654d3d014277e4ca3135a9cc6df Author: John Baldwin AuthorDate: 2024-01-31 17:15:58 +0000 Commit: John Baldwin CommitDate: 2024-04-08 17:49:59 +0000 timerfd: Move kern_timerfd_* prototypes to (cherry picked from commit 18cb422356f259f83ad3189cc4494e56265aef94) --- sys/kern/sys_timerfd.c | 1 + sys/sys/syscallsubr.h | 5 +++++ sys/sys/timerfd.h | 7 ------- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c index 80d1e9f4bfb2..8ac5b845f7ac 100644 --- a/sys/kern/sys_timerfd.c +++ b/sys/kern/sys_timerfd.c @@ -44,6 +44,7 @@ #include #include #include +#include #include #include #include diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 50a936591dc7..87e29f5ca5fc 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -364,6 +364,11 @@ int kern_thr_alloc(struct proc *, int pages, struct thread **); int kern_thr_exit(struct thread *td); int kern_thr_new(struct thread *td, struct thr_param *param); int kern_thr_suspend(struct thread *td, struct timespec *tsp); +int kern_timerfd_create(struct thread *td, int clockid, int flags); +int kern_timerfd_gettime(struct thread *td, int fd, + struct itimerspec *curr_value); +int kern_timerfd_settime(struct thread *td, int fd, int flags, + const struct itimerspec *new_value, struct itimerspec *old_value); int kern_truncate(struct thread *td, const char *path, enum uio_seg pathseg, off_t length); int kern_funlinkat(struct thread *td, int dfd, const char *path, int fd, diff --git a/sys/sys/timerfd.h b/sys/sys/timerfd.h index cace3b71498c..06409a77f7d2 100644 --- a/sys/sys/timerfd.h +++ b/sys/sys/timerfd.h @@ -58,13 +58,6 @@ __END_DECLS #else /* _KERNEL */ -struct thread; - -int kern_timerfd_create(struct thread *td, int clockid, int flags); -int kern_timerfd_gettime(struct thread *td, int fd, - struct itimerspec *curr_value); -int kern_timerfd_settime(struct thread *td, int fd, int flags, - const struct itimerspec *new_value, struct itimerspec *old_value); void timerfd_jumped(void); #endif /* !_KERNEL */