diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 10:46:51 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-01 10:46:51 -0600 |
| commit | f23b744ac0c3750a0a1742b8ff7e18c63e45253c (patch) | |
| tree | a9231d215cdb9bdb6cbb2932f877297f7c5f8874 /nuttx/mm/mm_sbrk.c | |
| parent | 83c30d32a3c84c9c7e992c8d1b29bf03e9fa8a3a (diff) | |
| download | px4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.tar.gz px4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.tar.bz2 px4-nuttx-f23b744ac0c3750a0a1742b8ff7e18c63e45253c.zip | |
Completes the implementation of sbrk() (untested)
Diffstat (limited to 'nuttx/mm/mm_sbrk.c')
| -rw-r--r-- | nuttx/mm/mm_sbrk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nuttx/mm/mm_sbrk.c b/nuttx/mm/mm_sbrk.c index 02fbab38d..c0c640735 100644 --- a/nuttx/mm/mm_sbrk.c +++ b/nuttx/mm/mm_sbrk.c @@ -47,7 +47,7 @@ #include <nuttx/mm.h> #include <nuttx/pgalloc.h> -#if defined(CONFIG_MM_PGALLOC) && defined(CONFIG_ARCH_USE_MMU) +#ifdef CONFIG_ARCH_ADDRENV /**************************************************************************** * Pre-processor Definitions @@ -115,7 +115,7 @@ FAR void *mm_sbrk(FAR struct mm_heap_s *heap, intptr_t incr, /* Check if this increment would exceed the maximum break value */ - if ((maxbreak - brkaddr) < (pgincr << MM_PGSHIFT)) + if ((brkaddr > 0) && ((maxbreak - brkaddr) < (pgincr << MM_PGSHIFT))) { err = ENOMEM; goto errout; @@ -143,4 +143,4 @@ errout: set_errno(err); return (FAR void *)-1; } -#endif /* CONFIG_MM_PGALLOC && CONFIG_ARCH_USE_MMU */ +#endif /* CONFIG_ARCH_ADDRENV */ |