diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-09 11:02:03 +0000 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2011-09-09 11:02:03 +0000 |
| commit | 5817297df3286347d17e358ab81bf4781812bf36 (patch) | |
| tree | a9ea68cfc530560928d55404eac8a944b568ed96 /cpukit | |
| parent | 2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> (diff) | |
| download | rtems-5817297df3286347d17e358ab81bf4781812bf36.tar.bz2 | |
2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de>
PR 1873/cpukit
* score/include/rtems/score/heap.h: Revert previous commit.
* sapi/include/confdefs.h: Use proper constants in
_Configure_From_workspace().
Diffstat (limited to '')
| -rw-r--r-- | cpukit/ChangeLog | 7 | ||||
| -rw-r--r-- | cpukit/sapi/include/confdefs.h | 2 | ||||
| -rw-r--r-- | cpukit/score/include/rtems/score/heap.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 492fe7bd46..f24051bbe7 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,12 @@ 2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> + PR 1873/cpukit + * score/include/rtems/score/heap.h: Revert previous commit. + * sapi/include/confdefs.h: Use proper constants in + _Configure_From_workspace(). + +2011-09-09 Sebastian Huber <sebastian.huber@embedded-brains.de> + * score/include/rtems/score/basedefs.h: Typo. * score/src/mpci.c, rtems/src/eventmp.c, rtems/src/msgmp.c, rtems/src/partmp.c, rtems/src/regionmp.c, rtems/src/semmp.c, diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h index a342bab46d..3ecc60941d 100644 --- a/cpukit/sapi/include/confdefs.h +++ b/cpukit/sapi/include/confdefs.h @@ -867,7 +867,7 @@ rtems_fs_init_functions_t rtems_fs_init_helper = * may be applied. */ #define _Configure_From_workspace(_size) \ - (ssize_t)((_size) + (2 * sizeof(uint32_t)) + CPU_ALIGNMENT) + (ssize_t)((_size) + HEAP_BLOCK_HEADER_SIZE + CPU_HEAP_ALIGNMENT - 1) /** * Do not use the unlimited bit as part of the multiplication diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h index 87dc66599e..6eee1c745b 100644 --- a/cpukit/score/include/rtems/score/heap.h +++ b/cpukit/score/include/rtems/score/heap.h @@ -177,9 +177,7 @@ typedef struct Heap_Block Heap_Block; } Heap_Protection_block_end; #define HEAP_PROTECTION_HEADER_SIZE \ - (sizeof(Heap_Protection_block_begin) + \ - CPU_ALIGNMENT + \ - sizeof(Heap_Protection_block_end)) + (sizeof(Heap_Protection_block_begin) + sizeof(Heap_Protection_block_end)) #endif /** |