Changeset 5817297 in rtems


Ignore:
Timestamp:
Sep 9, 2011, 11:02:03 AM (10 years ago)
Author:
Sebastian Huber <sebastian.huber@…>
Branches:
4.11, 5, master
Children:
fd1661f2
Parents:
d689de0
Message:

2011-09-09 Sebastian Huber <sebastian.huber@…>

PR 1873/cpukit

  • score/include/rtems/score/heap.h: Revert previous commit.
  • sapi/include/confdefs.h: Use proper constants in _Configure_From_workspace().
Location:
cpukit
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • cpukit/ChangeLog

    rd689de0 r5817297  
     12011-09-09      Sebastian Huber <sebastian.huber@embedded-brains.de>
     2
     3        PR 1873/cpukit
     4        * score/include/rtems/score/heap.h: Revert previous commit.
     5        * sapi/include/confdefs.h: Use proper constants in
     6        _Configure_From_workspace().
     7
    182011-09-09      Sebastian Huber <sebastian.huber@embedded-brains.de>
    29
  • cpukit/sapi/include/confdefs.h

    rd689de0 r5817297  
    868868 */
    869869#define _Configure_From_workspace(_size) \
    870   (ssize_t)((_size) + (2 * sizeof(uint32_t)) + CPU_ALIGNMENT)
     870  (ssize_t)((_size) + HEAP_BLOCK_HEADER_SIZE + CPU_HEAP_ALIGNMENT - 1)
    871871
    872872/**
  • cpukit/score/include/rtems/score/heap.h

    rd689de0 r5817297  
    178178
    179179  #define HEAP_PROTECTION_HEADER_SIZE \
    180     (sizeof(Heap_Protection_block_begin) + \
    181      CPU_ALIGNMENT + \
    182      sizeof(Heap_Protection_block_end))
     180    (sizeof(Heap_Protection_block_begin) + sizeof(Heap_Protection_block_end))
    183181#endif
    184182
Note: See TracChangeset for help on using the changeset viewer.