diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-03 11:43:23 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-03 11:43:23 -0600 |
| commit | 021cf46544be7eeb7900630cea0ee6ad768ba233 (patch) | |
| tree | ed79ec918407fb50623e3423f14823fbdb55af14 /nuttx/mm/umm_sbrk.c | |
| parent | 04a080ef2aaa4353e21ba5e767b5b304fdbf5365 (diff) | |
| download | px4-nuttx-021cf46544be7eeb7900630cea0ee6ad768ba233.tar.gz px4-nuttx-021cf46544be7eeb7900630cea0ee6ad768ba233.tar.bz2 px4-nuttx-021cf46544be7eeb7900630cea0ee6ad768ba233.zip | |
I love/hate conditional compilation
Diffstat (limited to 'nuttx/mm/umm_sbrk.c')
| -rw-r--r-- | nuttx/mm/umm_sbrk.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nuttx/mm/umm_sbrk.c b/nuttx/mm/umm_sbrk.c index 349c61b86..19b945d3c 100644 --- a/nuttx/mm/umm_sbrk.c +++ b/nuttx/mm/umm_sbrk.c @@ -45,7 +45,8 @@ #include <nuttx/pgalloc.h> #if defined(CONFIG_ARCH_ADDRENV) && defined(CONFIG_MM_PGALLOC) && \ - defined(CONFIG_ARCH_USE_MMU) + defined(CONFIG_ARCH_USE_MMU) && (!defined(CONFIG_BUILD_PROTECTED) || \ + !defined(__KERNEL__)) /**************************************************************************** * Pre-processor Definitions @@ -109,4 +110,4 @@ FAR void *sbrk(intptr_t incr) return mm_sbrk(USR_HEAP, incr, CONFIG_ARCH_STACK_NPAGES << MM_PGSHIFT); } -#endif /* CONFIG_ARCH_ADDRENV && CONFIG_MM_PGALLOC && CONFIG_ARCH_USE_MMU */ +#endif /* CONFIG_ARCH_ADDRENV && CONFIG_MM_PGALLOC && ... */ |