The branch main has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=7524994da0bb7b4eb003bc5ac465a316925d40ed
commit 7524994da0bb7b4eb003bc5ac465a316925d40ed
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2022-03-23 16:37:02 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2022-03-23 16:37:02 +0000
callout: Remove the CS_EXECUTING flag
It is now unused.
MFC after: 1 month
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D34626
---
sys/kern/kern_timeout.c | 4 ++--
sys/sys/callout.h | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/sys/kern/kern_timeout.c b/sys/kern/kern_timeout.c
index bc7b50e5ff8f..839c6d84a9ec 100644
--- a/sys/kern/kern_timeout.c
+++ b/sys/kern/kern_timeout.c
@@ -1309,7 +1309,7 @@ again:
cc_exec_drain(cc, direct) = drain;
}
CC_UNLOCK(cc);
- return ((flags & CS_EXECUTING) != 0);
+ return (0);
} else {
CTR3(KTR_CALLOUT, "failed to stop %p func %p arg %p",
c, c->c_func, c->c_arg);
@@ -1321,7 +1321,7 @@ again:
}
}
KASSERT(!sq_locked, ("sleepqueue chain still locked"));
- cancelled = ((flags & CS_EXECUTING) != 0);
+ cancelled = 0;
} else
cancelled = 1;
diff --git a/sys/sys/callout.h b/sys/sys/callout.h
index 41b47a32d9a1..9aa28e29d35c 100644
--- a/sys/sys/callout.h
+++ b/sys/sys/callout.h
@@ -64,8 +64,6 @@
/* Flags for callout_stop_safe() */
#define CS_DRAIN 0x0001 /* callout_drain(), wait allowed
*/
-#define CS_EXECUTING 0x0002 /* Positive return value
indicates that
- the callout was executing */
#ifdef _KERNEL
/*
