This is an automated email from the ASF dual-hosted git repository.

acassis pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git

commit f23465839823565fd771aa6d77e2bc0adc702e55
Author: Marco Casaroli <[email protected]>
AuthorDate: Tue Nov 3 18:20:22 2026 +0100

    sched/irq: Fix the build with SCHED_CRITMONITOR_MAXTIME_BUSYWAIT only.
    
    With SCHED_CRITMONITOR_MAXTIME_BUSYWAIT >= 0, but
    SCHED_CRITMONITOR_MAXTIME_CSECTION < 0 and no
    SCHED_INSTRUMENTATION_CSECTION, irq.h makes leave_critical_section() a
    macro for leave_critical_section_notrace().  irq_csection.c still
    defines the function leave_critical_section(), so the build fails with
    a redefinition of leave_critical_section_notrace().
    
    leave_critical_section() does nothing for the busy-wait time.  Build it
    with the same condition as irq.h.
    
    Assisted-by: Claude Code:claude-opus-5-5
    Signed-off-by: Marco Casaroli <[email protected]>
---
 sched/irq/irq_csection.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sched/irq/irq_csection.c b/sched/irq/irq_csection.c
index 5859623571f..0cb0ee19a2f 100644
--- a/sched/irq/irq_csection.c
+++ b/sched/irq/irq_csection.c
@@ -461,7 +461,6 @@ void leave_critical_section_notrace(irqstate_t flags)
 #endif
 
 #if CONFIG_SCHED_CRITMONITOR_MAXTIME_CSECTION >= 0 || \
-    CONFIG_SCHED_CRITMONITOR_MAXTIME_BUSYWAIT >= 0 || \
     defined(CONFIG_SCHED_INSTRUMENTATION_CSECTION)
 void leave_critical_section(irqstate_t flags)
 {

Reply via email to