From 2bc07a03aeded16f8b4ee014cc447df804009254 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 15 Aug 2014 06:56:42 -0600 Subject: [PATCH] Correct release notes, updat changelog, fix some conditional compilation --- ReleaseNotes | 2 +- sched/wdog/wd_start.c | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ReleaseNotes b/ReleaseNotes index 0211a033d2..5f495dd3e0 100644 --- a/ReleaseNotes +++ b/ReleaseNotes @@ -6601,7 +6601,7 @@ Bugfixes. Only the most critical bugfixes are listed here (see the ChangeLog fo NuttX-7.4 --------- -The 103rd release of NuttX, Version 7.4, was made on August 15, 2014, +The 104th release of NuttX, Version 7.4, was made on August 15, 2014, and is available for download from the SourceForge website. Note that release consists of two tarballs: nuttx-7.4.tar.gz and apps-7.4.tar.gz. Both may be needed (see the top-level nuttx/README.txt diff --git a/sched/wdog/wd_start.c b/sched/wdog/wd_start.c index 6ba19da390..9cf7edc352 100644 --- a/sched/wdog/wd_start.c +++ b/sched/wdog/wd_start.c @@ -437,14 +437,16 @@ unsigned int wd_timer(int ticks) wdog = (FAR wdog_t*)g_wdactivelist.head; - /* Decrement the lag for this watchdog. - * - * There is logic to handle the case where ticks is greater than +#ifndef CONFIG_SCHED_TICKLESS_ALARM + /* There is logic to handle the case where ticks is greater than * the watchdog lag, but if the scheduling is working properly * that should never happen. */ DEBUGASSERT(ticks <= wdog->lag); +#endif + /* Decrement the lag for this watchdog. */ + decr = MIN(wdog->lag, ticks); /* There are. Decrement the lag counter */