diff options
| -rw-r--r-- | nuttx/ChangeLog | 4 | ||||
| -rw-r--r-- | nuttx/include/stddef.h | 7 | ||||
| -rw-r--r-- | nuttx/sched/sched_cpuload.c | 4 |
3 files changed, 9 insertions, 6 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 3651571ee..9e7f9c554 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -6661,3 +6661,7 @@ and fs_procfscpuload.c: CPU load logic extended to keep counts on each thread. The per-thread CPU is now reported in the procfs under <pid>/loadavg (2014-2-23). + * include/stddef.h: ptrdiff_t is defined twice in stddef.h and also in + sys/types.h. stdef.h is the correct location for the definition, but + it includes sys/types.h so, at least for now, the definition will be + retained in sys/types.h (2014-2-25). diff --git a/nuttx/include/stddef.h b/nuttx/include/stddef.h index 6e24fbd7c..ecc5eb94c 100644 --- a/nuttx/include/stddef.h +++ b/nuttx/include/stddef.h @@ -75,9 +75,6 @@ * ptrdiff_t * Signed integer type of the result of subtracting two pointers. * - * NOTE: This type assumes that ssize_t will cover the largest address - * difference. This might not be true of CONFIG_MM_SMALL is defined. - * * wchar_t * Integer type whose range of values can represent distinct wide-character * codes for all members of the largest character set specified among the @@ -89,7 +86,7 @@ * size_t * Unsigned integer type of the result of the sizeof operator. * - * NOTE: Currently the type definitions of both wchar_t and size_t are + * NOTE: Currently the type definitions of ptrdiff_t, wchar_t, and size_t are * in sys/types.h but should be moved here sometime. * * The implementation shall support one or more programming environments in @@ -100,6 +97,4 @@ * Reference: Opengroup.org */ -typedef ssize_t ptrdiff_t; - #endif /* __INCLUDE_STDDEF_H */ diff --git a/nuttx/sched/sched_cpuload.c b/nuttx/sched/sched_cpuload.c index b02db1d64..802977f87 100644 --- a/nuttx/sched/sched_cpuload.c +++ b/nuttx/sched/sched_cpuload.c @@ -91,6 +91,10 @@ volatile uint32_t g_cpuload_total; * Return Value: * None * + * Assumptions/Limitations: + * This function is called from a timer interrupt handler with all + * interrupts disabled. + * ************************************************************************/ void weak_function sched_process_cpuload(void) |