diff options
| -rw-r--r-- | misc/buildroot/ChangeLog | 2 | ||||
| -rw-r--r-- | nuttx/ReleaseNotes | 2 | ||||
| -rw-r--r-- | nuttx/sched/wdog/wd_start.c | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/misc/buildroot/ChangeLog b/misc/buildroot/ChangeLog index 57396b639..a993fffe3 100644 --- a/misc/buildroot/ChangeLog +++ b/misc/buildroot/ChangeLog @@ -153,3 +153,5 @@ buildroot-1.14 2014-03-15 <gnutt@nuttx.org> buildroot-1.15 2014-xx-xx <gnutt@nuttx.org> + * Minor changes for clean build under OpenSUSE 13.1. Add kconfig-frontends + to two configurations. (2014-8-14). diff --git a/nuttx/ReleaseNotes b/nuttx/ReleaseNotes index 0211a033d..5f495dd3e 100644 --- a/nuttx/ReleaseNotes +++ b/nuttx/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/nuttx/sched/wdog/wd_start.c b/nuttx/sched/wdog/wd_start.c index 6ba19da39..9cf7edc35 100644 --- a/nuttx/sched/wdog/wd_start.c +++ b/nuttx/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 */ |