diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 14:47:22 -0600 |
| commit | 64892e44f2ce2612c77b1b20497fb007adafafb8 (patch) | |
| tree | 2c917f29727a017b85193ac85959663d504b26e5 /nuttx/arch/arm/src/tiva/tiva_allocateheap.c | |
| parent | c48af0eb9c61462f59a7ba63ca7a73e8df146f49 (diff) | |
| download | nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.gz nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.tar.bz2 nuttx-64892e44f2ce2612c77b1b20497fb007adafafb8.zip | |
Rename CONFIG_NUTTX_KERNEL to CONFIG_BUILD_PROTECTED; Partially integrate new CONFIG_BUILD_KERNEL
Diffstat (limited to 'nuttx/arch/arm/src/tiva/tiva_allocateheap.c')
| -rw-r--r-- | nuttx/arch/arm/src/tiva/tiva_allocateheap.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/nuttx/arch/arm/src/tiva/tiva_allocateheap.c b/nuttx/arch/arm/src/tiva/tiva_allocateheap.c index b38457e98..a76fb5bc8 100644 --- a/nuttx/arch/arm/src/tiva/tiva_allocateheap.c +++ b/nuttx/arch/arm/src/tiva/tiva_allocateheap.c @@ -76,7 +76,7 @@ * Description: * This function will be called to dynamically set aside the heap region. * - * For the kernel build (CONFIG_NUTTX_KERNEL=y) with both kernel- and + * For the kernel build (CONFIG_BUILD_PROTECTED=y) with both kernel- and * user-space heaps (CONFIG_MM_KERNEL_HEAP=y), this function provides the * size of the unprotected, user-space heap. * @@ -105,7 +105,7 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) { -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) /* Get the unaligned size and position of the user-space heap. * This heap begins after the user-space .bss section at an offset * of CONFIG_MM_KERNEL_HEAPSIZE (subject to alignment). @@ -151,13 +151,13 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) * Name: up_allocate_kheap * * Description: - * For the kernel build (CONFIG_NUTTX_KERNEL=y) with both kernel- and + * For the kernel build (CONFIG_BUILD_PROTECTED=y) with both kernel- and * user-space heaps (CONFIG_MM_KERNEL_HEAP=y), this function allocates * (and protects) the kernel-space heap. * ****************************************************************************/ -#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) +#if defined(CONFIG_BUILD_PROTECTED) && defined(CONFIG_MM_KERNEL_HEAP) void up_allocate_kheap(FAR void **heap_start, size_t *heap_size) { /* Get the unaligned size and position of the user-space heap. |