Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Mar 2024 17:29:27 GMT
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org
Subject:   git: 0ecf0b26a750 - main - timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae
Message-ID:  <202403061729.426HTRUH027491@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by bapt:

URL: https://cgit.FreeBSD.org/src/commit/?id=0ecf0b26a750582b804e238e6446db55188d7fdc

commit 0ecf0b26a750582b804e238e6446db55188d7fdc
Author:     Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2024-03-06 17:28:02 +0000
Commit:     Baptiste Daroussin <bapt@FreeBSD.org>
CommitDate: 2024-03-06 17:28:02 +0000

    timerfd_create: fix after cf742faa39a58a9b43b671c66097e6880459d4ae
    
    Remove the include that crept in by accident
    Clang complains about CLOCK_BOOTTIME being the same for now as
    CLOCK_UPTIME, so remove CLOCK_BOOTTIME and leave a comment for
    what to do when CLOCK_BOOTTIME will be different for real.
---
 sys/kern/sys_timerfd.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/sys/kern/sys_timerfd.c b/sys/kern/sys_timerfd.c
index f74fb87bea75..8ac5b845f7ac 100644
--- a/sys/kern/sys_timerfd.c
+++ b/sys/kern/sys_timerfd.c
@@ -26,7 +26,6 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/_clock_id.h>
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
@@ -439,8 +438,10 @@ kern_timerfd_create(struct thread *td, int clockid, int flags)
 	case CLOCK_MONOTONIC:
 		/* FALLTHROUGH */
 	case CLOCK_UPTIME:
-		/* FALLTHROUGH */
-	case CLOCK_BOOTTIME:
+		/*
+		 * CLOCK_BOOTTIME should be added once different from
+		 * CLOCK_UPTIME
+		 */
 		break;
 	default:
 		return (EINVAL);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403061729.426HTRUH027491>