This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch releases/12.7
in repository https://gitbox.apache.org/repos/asf/nuttx.git
The following commit(s) were added to refs/heads/releases/12.7 by this push:
new 9dbde04327 Revert "toolchain/ghs: Fix
CONFIG_SCHED_CRITMONITOR_MAXTIME_XXX "zero used for undefined preprocessing
identifier" warnings"
9dbde04327 is described below
commit 9dbde0432737b60c5c17b9b3525e00c6f50657b4
Author: chao an <[email protected]>
AuthorDate: Mon Sep 23 08:59:15 2024 +0800
Revert "toolchain/ghs: Fix CONFIG_SCHED_CRITMONITOR_MAXTIME_XXX "zero used
for undefined preprocessing identifier" warnings"
move private define to public
This reverts commit 236678d730220138416724d2cab25d6e1bd2ce9d.
Signed-off-by: chao an <[email protected]>
---
include/nuttx/sched.h | 14 ++++++++++++++
sched/sched/sched.h | 24 ------------------------
2 files changed, 14 insertions(+), 24 deletions(-)
diff --git a/include/nuttx/sched.h b/include/nuttx/sched.h
index ba4b865aaa..e607802bb6 100644
--- a/include/nuttx/sched.h
+++ b/include/nuttx/sched.h
@@ -72,10 +72,16 @@
# define CONFIG_SCHED_SPORADIC_MAXREPL 3
#endif
+/* Scheduling monitor */
+
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD -1
#endif
+#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE
+# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE -1
+#endif
+
#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION -1
#endif
@@ -84,6 +90,14 @@
# define CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION -1
#endif
+#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ
+# define CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ -1
+#endif
+
+#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG
+# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG -1
+#endif
+
/* Task Management Definitions **********************************************/
/* Special task IDS. Any negative PID is invalid. */
diff --git a/sched/sched/sched.h b/sched/sched/sched.h
index 79c01eeada..a09f55a88c 100644
--- a/sched/sched/sched.h
+++ b/sched/sched/sched.h
@@ -107,30 +107,6 @@
# define TLIST_BLOCKED(t) __TLIST_HEAD(t)
#endif
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_THREAD -1
-#endif
-
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WQUEUE -1
-#endif
-
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_PREEMPTION -1
-#endif
-
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION -1
-#endif
-
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_IRQ -1
-#endif
-
-#ifndef CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG
-# define CONFIG_SCHED_CRITMONITOR_MAXTIME_WDOG -1
-#endif
-
#ifdef CONFIG_SCHED_CRITMONITOR_MAXTIME_PANIC
# define CRITMONITOR_PANIC(fmt, ...) \
do \
