PR 1873/cpukit
	* score/include/rtems/score/heap.h: Revert previous commit.
	* sapi/include/confdefs.h: Use proper constants in
	_Configure_From_workspace().
This commit is contained in:
Sebastian Huber
2011-09-09 11:02:03 +00:00
parent d689de0b3c
commit 5817297df3
3 changed files with 9 additions and 4 deletions
+7
View File
@@ -1,3 +1,10 @@
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.
+1 -1
View File
@@ -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
+1 -3
View File
@@ -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
/**