diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-05 21:18:03 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-04-05 21:18:03 +0000 |
| commit | 808d6faee2744a707579aec30bc34f60229acfc9 (patch) | |
| tree | 997dab90f2a8184e1ae407b043fb985426c5208b | |
| parent | 16be59858afa332cc8a0f8e61a215e1deea5e897 (diff) | |
| download | nuttx-808d6faee2744a707579aec30bc34f60229acfc9.tar.gz nuttx-808d6faee2744a707579aec30bc34f60229acfc9.tar.bz2 nuttx-808d6faee2744a707579aec30bc34f60229acfc9.zip | |
Fix bugs introduced in last commit
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3470 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/fs/fs_inode.c | 3 | ||||
| -rw-r--r-- | nuttx/include/nuttx/kmalloc.h | 4 | ||||
| -rw-r--r-- | nuttx/lib/misc/lib_init.c | 1 |
3 files changed, 5 insertions, 3 deletions
diff --git a/nuttx/fs/fs_inode.c b/nuttx/fs/fs_inode.c index 6bbdea287..a03448a0e 100644 --- a/nuttx/fs/fs_inode.c +++ b/nuttx/fs/fs_inode.c @@ -39,12 +39,13 @@ #include <nuttx/config.h> -#include <stdlib.h> #include <assert.h> #include <semaphore.h> #include <errno.h> +#include <nuttx/kmalloc.h> #include <nuttx/fs.h> + #include "fs_internal.h" /**************************************************************************** diff --git a/nuttx/include/nuttx/kmalloc.h b/nuttx/include/nuttx/kmalloc.h index aafe150fd..acdfca1cd 100644 --- a/nuttx/include/nuttx/kmalloc.h +++ b/nuttx/include/nuttx/kmalloc.h @@ -78,8 +78,8 @@ extern "C" { # define kmm_initialize(h,s) mm_initialize(h,s) # define kmm_addregion(h,s) mm_addregion(h,s) -# define kmm_trysemaphore(h,s) mm_trysemaphore(h,s) -# define kmm_givesemaphore(h,s) mm_givesemaphore(h,s) +# define kmm_trysemaphore() mm_trysemaphore() +# define kmm_givesemaphore() mm_givesemaphore() # define kmalloc(s) malloc(s) # define kzalloc(s) zalloc(s) diff --git a/nuttx/lib/misc/lib_init.c b/nuttx/lib/misc/lib_init.c index 112b0a3c7..55bcbf0af 100644 --- a/nuttx/lib/misc/lib_init.c +++ b/nuttx/lib/misc/lib_init.c @@ -43,6 +43,7 @@ #include <string.h> #include <errno.h> +#include <nuttx/kmalloc.h> #include <nuttx/fs.h> #include <nuttx/lib.h> |