diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 13:21:33 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 13:21:33 +0000 |
| commit | c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b (patch) | |
| tree | 18bc9e860b1c571b02e09105903cf0dec01e36a8 /nuttx/include | |
| parent | dffbc36a6adb56b217a399dd3acfebdd0f1dc5cf (diff) | |
| download | px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.tar.gz px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.tar.bz2 px4-nuttx-c0fe85b4248e9dbd6beb66ef6cd7fb5025c40d1b.zip | |
Fix a typo that crept into lpc17_allocateheap.c in the recent kernel allocator changes
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5729 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/include')
| -rw-r--r-- | nuttx/include/nuttx/kmalloc.h | 2 | ||||
| -rw-r--r-- | nuttx/include/nuttx/sched.h | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/nuttx/include/nuttx/kmalloc.h b/nuttx/include/nuttx/kmalloc.h index 40b12f0fb..d712bddf4 100644 --- a/nuttx/include/nuttx/kmalloc.h +++ b/nuttx/include/nuttx/kmalloc.h @@ -113,7 +113,7 @@ extern "C" /* This familiy of allocators is used to manage kernel protected memory */ -#ifndef CONFIG_NUTTX_KERNEL +#if !defined(CONFIG_NUTTX_KERNEL) /* If this is not a kernel build, then these map to the same interfaces * as were used for the user-mode function. */ diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h index d5e258f79..62ad1cc47 100644 --- a/nuttx/include/nuttx/sched.h +++ b/nuttx/include/nuttx/sched.h @@ -383,10 +383,18 @@ struct task_group_s #endif /* FILE streams ***************************************************************/ + /* In a flat, single-heap build. The stream list is allocated with this + * structure. But kernel mode with a kernel allocator, it must be separately + * allocated using a user-space allocator. + */ #if CONFIG_NFILE_STREAMS > 0 +#if defined(CONFIG_NUTTX_KERNEL) && defined(CONFIG_MM_KERNEL_HEAP) + FAR struct streamlist *tg_streamlist; +#else struct streamlist tg_streamlist; /* Holds C buffered I/O info */ -#endif /* CONFIG_NFILE_STREAMS */ +#endif +#endif /* Sockets ********************************************************************/ |