From d875597c46e328375557b20d50c7526976da1637 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Fri, 7 Dec 2007 17:52:28 +0000 Subject: [PATCH] 2007-12-07 Joel Sherrill * sapi/include/confdefs.h: Separate the concept of configuring the interrupt stack size from actually reserving memory for it in the RTEMS Workspace. --- cpukit/ChangeLog | 6 ++++++ cpukit/sapi/include/confdefs.h | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index d1cc1ff481..ad73603720 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2007-12-07 Joel Sherrill + + * sapi/include/confdefs.h: Separate the concept of configuring the + interrupt stack size from actually reserving memory for it in the + RTEMS Workspace. + 2007-12-06 Joel Sherrill * httpd/Makefile.am, httpd/preinstall.am: rtems_webserver.h must be diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index 35ca7038a7..83a9dd35eb 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -211,8 +211,9 @@ extern int rtems_telnetd_maximum_ptys; * XXX memory from the Workspace */ #if (CPU_ALLOCATE_INTERRUPT_STACK == 0) - #undef CONFIGURE_INTERRUPT_STACK_SIZE - #define CONFIGURE_INTERRUPT_STACK_SIZE 0 + #define CONFIGURE_INTERRUPT_STACK_MEMORY 0 +#else + #define CONFIGURE_INTERRUPT_STACK_MEMORY CONFIGURE_INTERRUPT_STACK_SIZE #endif /* @@ -1105,7 +1106,7 @@ itron_initialization_tasks_table ITRON_Initialization_tasks[] = { ( CONFIGURE_MEMORY_FOR_TASKS(1) + /* IDLE */ \ ((PRIORITY_MAXIMUM+1) * sizeof(Chain_Control)) + /* Ready chains */ \ 256 + /* name/ptr table overhead */ \ - CONFIGURE_INTERRUPT_STACK_SIZE + /* interrupt stack */ \ + CONFIGURE_INTERRUPT_STACK_MEMORY + /* interrupt stack */ \ CONFIGURE_API_MUTEX_MEMORY /* allocation mutex */ \ )