summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--cpukit/ChangeLog6
-rw-r--r--cpukit/score/include/rtems/score/heap.h4
2 files changed, 9 insertions, 1 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index 0225da6288..14d3cf6e33 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-21 Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+ PR 1873/cpukit
+ * score/include/rtems/score/heap.h: When using heap protection, we
+ should account for adding an aligned protection footer.
+
2011-08-17 Sebastian Huber <sebastian.huber@embedded-brains.de>
* sapi/include/confdefs.h: Revert previous commit due to multi-lib
diff --git a/cpukit/score/include/rtems/score/heap.h b/cpukit/score/include/rtems/score/heap.h
index 6eee1c745b..87dc66599e 100644
--- a/cpukit/score/include/rtems/score/heap.h
+++ b/cpukit/score/include/rtems/score/heap.h
@@ -177,7 +177,9 @@ typedef struct Heap_Block Heap_Block;
} Heap_Protection_block_end;
#define HEAP_PROTECTION_HEADER_SIZE \
- (sizeof(Heap_Protection_block_begin) + sizeof(Heap_Protection_block_end))
+ (sizeof(Heap_Protection_block_begin) + \
+ CPU_ALIGNMENT + \
+ sizeof(Heap_Protection_block_end))
#endif
/**