diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 22:01:50 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-08 22:01:50 +0000 |
| commit | f2c129b281fc8fa30eccb9b34df534f954ee3c47 (patch) | |
| tree | a5ff5a1a0415f7fabf66180ccb432243740f4d74 /nuttx/arch/z80 | |
| parent | 5e160bcf59441ce40088ca089cbeb4461a0b0d6a (diff) | |
| download | px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.tar.gz px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.tar.bz2 px4-nuttx-f2c129b281fc8fa30eccb9b34df534f954ee3c47.zip | |
up_addregion should use kmm_addregion; move garbage kmm*.c file to mm/. for now
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5721 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/z80')
| -rw-r--r-- | nuttx/arch/z80/src/common/up_allocateheap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/nuttx/arch/z80/src/common/up_allocateheap.c b/nuttx/arch/z80/src/common/up_allocateheap.c index 94b06e375..734d678e7 100644 --- a/nuttx/arch/z80/src/common/up_allocateheap.c +++ b/nuttx/arch/z80/src/common/up_allocateheap.c @@ -1,7 +1,7 @@ /**************************************************************************** * common/up_allocateheap.c * - * Copyright (C) 2007, 2008 Gregory Nutt. All rights reserved. + * Copyright (C) 2007, 2008, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> * * Redistribution and use in source and binary forms, with or without @@ -41,8 +41,9 @@ #include <sys/types.h> #include <debug.h> + #include <nuttx/arch.h> -#include <nuttx/mm.h> +#include <nuttx/kmalloc.h> #include "up_arch.h" #include "up_internal.h" @@ -109,6 +110,6 @@ void up_allocate_heap(FAR void **heap_start, size_t *heap_size) #if CONFIG_MM_REGIONS > 1 void up_addregion(void) { - mm_addregion((FAR void*)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE); + kmm_addregion((FAR void*)CONFIG_HEAP2_BASE, CONFIG_HEAP2_SIZE); } #endif |