From 186337067299db28dd2cb88b74c60ab30bb363df Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Wed, 24 Sep 2014 07:05:02 -0600
Subject: [PATCH] Move include/nuttx/shm.h to include/nuttx/mm/shm.h

---
 binfmt/binfmt_execmodule.c   | 2 +-
 include/nuttx/{ => mm}/shm.h | 8 ++++----
 include/nuttx/sched.h        | 2 +-
 mm/shm/shm_initialize.c      | 2 +-
 mm/shm/shmctl.c              | 2 +-
 mm/shm/shmdt.c               | 2 +-
 mm/shm/shmget.c              | 2 +-
 sched/init/os_start.c        | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)
 rename include/nuttx/{ => mm}/shm.h (97%)

diff --git a/binfmt/binfmt_execmodule.c b/binfmt/binfmt_execmodule.c
index 849ee08cc3..256a7b7429 100644
--- a/binfmt/binfmt_execmodule.c
+++ b/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/include/nuttx/shm.h b/include/nuttx/mm/shm.h
similarity index 97%
rename from include/nuttx/shm.h
rename to include/nuttx/mm/shm.h
index 9259f01a6d..1a568e81c4 100644
--- a/include/nuttx/shm.h
+++ b/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/include/nuttx/sched.h b/include/nuttx/sched.h
index 321449f6cd..28f157f3ce 100644
--- a/include/nuttx/sched.h
+++ b/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/mm/shm/shm_initialize.c b/mm/shm/shm_initialize.c
index af3170c475..c2289103c7 100644
--- a/mm/shm/shm_initialize.c
+++ b/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/mm/shm/shmctl.c b/mm/shm/shmctl.c
index 07ed9913b3..0c2dc6cb86 100644
--- a/mm/shm/shmctl.c
+++ b/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/mm/shm/shmdt.c b/mm/shm/shmdt.c
index 8acfc6197b..0ecee2ab30 100644
--- a/mm/shm/shmdt.c
+++ b/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/mm/shm/shmget.c b/mm/shm/shmget.c
index 3aa8f0bfff..35bb7c26ac 100644
--- a/mm/shm/shmget.c
+++ b/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/sched/init/os_start.c b/sched/init/os_start.c
index 91902b82ee..e2c01c1ced 100644
--- a/sched/init/os_start.c
+++ b/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>