diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-28 17:19:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-01-28 17:19:01 +0000 |
| commit | def9eef5f7fd8d82fcb194d77636cb7801d64394 (patch) | |
| tree | 9169485a3638c511dd424a298183756b74fbd548 /cpukit/sapi | |
| parent | 2008-01-25 Jennifer Averett <jennifer.averett@OARcorp.com> (diff) | |
| download | rtems-def9eef5f7fd8d82fcb194d77636cb7801d64394.tar.bz2 | |
2008-01-28 Joel Sherrill <joel.sherrill@OARcorp.com>
* sapi/include/confdefs.h, score/src/mpci.c, score/src/objectmp.c,
score/src/objectnametoid.c, score/src/objectnametoidstring.c:
Multiprocessing compiles again and survives initialization. The
recent object name and confdefs.h changes had broken it.
Diffstat (limited to 'cpukit/sapi')
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 2fc0781ad0..9717632766 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -525,6 +525,10 @@ int rtems_bdbuf_configuration_size =( sizeof(rtems_bdbuf_configuration) #define CONFIGURE_MP_MAXIMUM_PROXIES 32 #endif +#ifndef CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK +#define CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK 0 +#endif + #ifndef CONFIGURE_MP_MPCI_TABLE_POINTER #include <mpci.h> #define CONFIGURE_MP_MPCI_TABLE_POINTER &MPCI_table @@ -532,11 +536,12 @@ int rtems_bdbuf_configuration_size =( sizeof(rtems_bdbuf_configuration) #ifdef CONFIGURE_INIT rtems_multiprocessing_table Multiprocessing_configuration = { - CONFIGURE_MP_NODE_NUMBER, /* local node number */ - CONFIGURE_MP_MAXIMUM_NODES, /* maximum # nodes in system */ - CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS, /* maximum # global objects */ - CONFIGURE_MP_MAXIMUM_PROXIES, /* maximum # proxies */ - CONFIGURE_MP_MPCI_TABLE_POINTER /* pointer to MPCI config table */ + CONFIGURE_MP_NODE_NUMBER, /* local node number */ + CONFIGURE_MP_MAXIMUM_NODES, /* maximum # nodes in system */ + CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS, /* maximum # global objects */ + CONFIGURE_MP_MAXIMUM_PROXIES, /* maximum # proxies */ + CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK, /* MPCI task stack > minimum */ + CONFIGURE_MP_MPCI_TABLE_POINTER /* pointer to MPCI config table */ }; #endif @@ -1096,7 +1101,8 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = { #define CONFIGURE_MEMORY_FOR_MP \ ( CONFIGURE_MEMORY_FOR_PROXIES(CONFIGURE_MP_MAXIMUM_PROXIES) + \ CONFIGURE_MEMORY_FOR_GLOBAL_OBJECTS(CONFIGURE_MP_MAXIMUM_GLOBAL_OBJECTS) + \ - CONFIGURE_MEMORY_FOR_TASKS(1) \ + CONFIGURE_MEMORY_FOR_TASKS(1) + \ + CONFIGURE_EXTRA_MPCI_RECEIVE_SERVER_STACK \ ) #endif /* CONFIGURE_HAS_OWN_MULTIPROCESING_TABLE */ |