summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2005-09-01 13:27:02 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2005-09-01 13:27:02 +0000
commitf54bc0528535b268fc3ddc0d3fa13d0d4f8472ad (patch)
tree08aef183fc259acedb7e52270863b27cd0037bfe
parent2005-09-01 Joel Sherrill <joel@OARcorp.com> (diff)
downloadrtems-f54bc0528535b268fc3ddc0d3fa13d0d4f8472ad.tar.bz2
2005-09-01 Nuno Costa <nuno-costa@iol.pt>
PR 804 * include/confdefs.h: Memory for POSIX timers not accounted for. Patch adapted from edit comment in PR filed.
-rw-r--r--cpukit/sapi/ChangeLog6
-rw-r--r--cpukit/sapi/include/confdefs.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog
index 83371c4e47..bfd50ef0ba 100644
--- a/cpukit/sapi/ChangeLog
+++ b/cpukit/sapi/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-01 Nuno Costa <nuno-costa@iol.pt>
+
+ PR 804
+ * include/confdefs.h: Memory for POSIX timers not accounted for. Patch
+ adapted from edit comment in PR filed.
+
2005-06-09 Jacques Seronie Vivien <jacques.seronievivien@astrium.eads.net>
PR 790/rtems
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index 42dabaa8d9..6e8e9fb618 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -480,6 +480,7 @@ rtems_extensions_table Configuration_Initial_Extensions[] = {
#include <rtems/posix/psignal.h>
#include <rtems/posix/semaphore.h>
#include <rtems/posix/threadsup.h>
+#include <rtems/posix/timer.h>
#ifndef CONFIGURE_MAXIMUM_POSIX_THREADS
#define CONFIGURE_MAXIMUM_POSIX_THREADS 0
@@ -574,8 +575,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = {
( sizeof(POSIX_Keys_Control) + CONFIGURE_OBJECT_TABLE_STUFF ) )
#define CONFIGURE_MEMORY_FOR_POSIX_TIMERS(_timers) \
- ((_timers) * \
- ( 0 ) )
+ ((_timers) * (sizeof(POSIX_Timer_Control) + CONFIGURE_OBJECT_TABLE_STUFF))
#define CONFIGURE_MEMORY_FOR_POSIX_QUEUED_SIGNALS(_queued_signals) \
((_queued_signals) * \
@@ -601,6 +601,7 @@ posix_initialization_threads_table POSIX_Initialization_threads[] = {
CONFIGURE_MAXIMUM_POSIX_MESSAGE_QUEUES ) + \
CONFIGURE_MEMORY_FOR_POSIX_SEMAPHORES( \
CONFIGURE_MAXIMUM_POSIX_SEMAPHORES ) + \
+ CONFIGURE_MEMORY_FOR_POSIX_TIMERS( CONFIGURE_MAXIMUM_POSIX_TIMERS ) + \
(CONFIGURE_POSIX_INIT_THREAD_STACK_SIZE) \
)