summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregory Nutt <gnutt@nuttx.org>2014-09-24 07:05:02 -0600
committerGregory Nutt <gnutt@nuttx.org>2014-09-24 07:05:02 -0600
commitb09d57f7fbf5bdf2b96a46707ef3db069f5bccbf (patch)
tree1adeb2e6c09a023dc56c0a2b31a51a0a2d12b46e
parent261eb94ddc9dcb411212b864483709584f73fc50 (diff)
downloadnuttx-b09d57f7fbf5bdf2b96a46707ef3db069f5bccbf.tar.gz
nuttx-b09d57f7fbf5bdf2b96a46707ef3db069f5bccbf.tar.bz2
nuttx-b09d57f7fbf5bdf2b96a46707ef3db069f5bccbf.zip
Move include/nuttx/shm.h to include/nuttx/mm/shm.h
-rw-r--r--nuttx/binfmt/binfmt_execmodule.c2
-rw-r--r--nuttx/include/nuttx/mm/shm.h (renamed from nuttx/include/nuttx/shm.h)8
-rw-r--r--nuttx/include/nuttx/sched.h2
-rw-r--r--nuttx/mm/shm/shm_initialize.c2
-rw-r--r--nuttx/mm/shm/shmctl.c2
-rw-r--r--nuttx/mm/shm/shmdt.c2
-rw-r--r--nuttx/mm/shm/shmget.c2
-rw-r--r--nuttx/sched/init/os_start.c2
8 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/binfmt/binfmt_execmodule.c b/nuttx/binfmt/binfmt_execmodule.c
index 849ee08cc..256a7b742 100644
--- a/nuttx/binfmt/binfmt_execmodule.c
+++ b/nuttx/binfmt/binfmt_execmodule.c
@@ -49,7 +49,7 @@
#include <nuttx/arch.h>
#include <nuttx/kmalloc.h>
#include <nuttx/mm.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include <nuttx/binfmt/binfmt.h>
#include "sched/sched.h"
diff --git a/nuttx/include/nuttx/shm.h b/nuttx/include/nuttx/mm/shm.h
index 9259f01a6..1a568e81c 100644
--- a/nuttx/include/nuttx/shm.h
+++ b/nuttx/include/nuttx/mm/shm.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * include/nuttx/shm.h
+ * include/nuttx/mm/shm.h
*
* Copyright (C) 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org>
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __INCLUDE_NUTTX_SHM_H
-#define __INCLUDE_NUTTX_SHM_H
+#ifndef __INCLUDE_NUTTX_MM_SHM_H
+#define __INCLUDE_NUTTX_MM_SHM_H
/****************************************************************************
* Included Files
@@ -178,4 +178,4 @@ struct task_group_s; /* Forward reference */
void shm_group_release(FAR struct task_group_s *group);
#endif /* CONFIG_MM_SHM */
-#endif /* __INCLUDE_NUTTX_SHM_H */
+#endif /* __INCLUDE_NUTTX_MM_SHM_H */
diff --git a/nuttx/include/nuttx/sched.h b/nuttx/include/nuttx/sched.h
index 321449f6c..28f157f3c 100644
--- a/nuttx/include/nuttx/sched.h
+++ b/nuttx/include/nuttx/sched.h
@@ -52,7 +52,7 @@
#include <time.h>
#include <nuttx/irq.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include <nuttx/fs/fs.h>
#include <nuttx/net/net.h>
diff --git a/nuttx/mm/shm/shm_initialize.c b/nuttx/mm/shm/shm_initialize.c
index af3170c47..c2289103c 100644
--- a/nuttx/mm/shm/shm_initialize.c
+++ b/nuttx/mm/shm/shm_initialize.c
@@ -46,7 +46,7 @@
#include <nuttx/sched.h>
#include <nuttx/mm/gran.h>
#include <nuttx/pgalloc.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include "shm/shm.h"
diff --git a/nuttx/mm/shm/shmctl.c b/nuttx/mm/shm/shmctl.c
index 07ed9913b..0c2dc6cb8 100644
--- a/nuttx/mm/shm/shmctl.c
+++ b/nuttx/mm/shm/shmctl.c
@@ -48,7 +48,7 @@
#include <errno.h>
#include <assert.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include <nuttx/pgalloc.h>
#include "shm/shm.h"
diff --git a/nuttx/mm/shm/shmdt.c b/nuttx/mm/shm/shmdt.c
index 8acfc6197..0ecee2ab3 100644
--- a/nuttx/mm/shm/shmdt.c
+++ b/nuttx/mm/shm/shmdt.c
@@ -44,7 +44,7 @@
#include <nuttx/arch.h>
#include <nuttx/sched.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include "shm/shm.h"
diff --git a/nuttx/mm/shm/shmget.c b/nuttx/mm/shm/shmget.c
index 3aa8f0bff..35bb7c26a 100644
--- a/nuttx/mm/shm/shmget.c
+++ b/nuttx/mm/shm/shmget.c
@@ -47,7 +47,7 @@
#include <errno.h>
#include <nuttx/pgalloc.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include "shm/shm.h"
diff --git a/nuttx/sched/init/os_start.c b/nuttx/sched/init/os_start.c
index 91902b82e..e2c01c1ce 100644
--- a/nuttx/sched/init/os_start.c
+++ b/nuttx/sched/init/os_start.c
@@ -49,7 +49,7 @@
#include <nuttx/net/net.h>
#include <nuttx/lib.h>
#include <nuttx/mm.h>
-#include <nuttx/shm.h>
+#include <nuttx/mm/shm.h>
#include <nuttx/kmalloc.h>
#include <nuttx/init.h>