Move include/nuttx/gran.h to include/nuttx/mm/gran.h

nuttx/arch/z80/src/z180/z180_mmu.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 #include <debug.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include <arch/irq.h>
 #include <arch/io.h>

nuttx/binfmt/binfmt_execmodule.c

@@ -233,7 +233,7 @@ int exec_module(FAR const struct binary_s *binp)
 #if defined(CONFIG_BUILD_KERNEL) && defined(CONFIG_MM_SHM)
   /* Initialize the shared memory virtual page allocator */
 
-  ret = shm_group_initialize(&tcb->cmn.group);
+  ret = shm_group_initialize(tcb->cmn.group);
   if (ret < 0)
     {
       bdbg("ERROR: shm_group_initialize() failed: %d\n", ret);

nuttx/configs/px4fmu-v2_upstream/src/px4fmu2_init.c

@@ -56,7 +56,7 @@
 #include <nuttx/sdio.h>
 #include <nuttx/mmcsd.h>
 #include <nuttx/analog/adc.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include <stm32.h>
 #include "board_config.h"

nuttx/include/nuttx/fs/fat.h

@@ -105,7 +105,7 @@ EXTERN int fat_setattrib(const char *path, fat_attrib_t setbits, fat_attrib_t cl
  *   capable memory.
  *
  *   This functions may be simple wrappers around gran_alloc() and gran_free()
- *   (See nuttx/gran.h).
+ *   (See nuttx/mm/gran.h).
  *
  ****************************************************************************/
 

nuttx/include/nuttx/mm/gran.h

@@ -1,5 +1,5 @@
 /****************************************************************************
- * include/nuttx/gran.h
+ * include/nuttx/mm/gran.h
  * General purpose granule memory allocator.
  *
  *   Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved.
@@ -34,8 +34,8 @@
  *
  ****************************************************************************/
 
-#ifndef __INCLUDE_NUTTX_GRAN_H
-#define __INCLUDE_NUTTX_GRAN_H
+#ifndef __INCLUDE_NUTTX_MM_GRAN_H
+#define __INCLUDE_NUTTX_MM_GRAN_H
 
 /****************************************************************************
  * Included Files
@@ -250,4 +250,4 @@ void gran_free(GRAN_HANDLE handle, FAR void *memory, size_t size);
 #endif
 
 #endif /* CONFIG_GRAN */
-#endif /* __INCLUDE_NUTTX_GRAN_H */
+#endif /* __INCLUDE_NUTTX_MM_GRAN_H */

nuttx/include/nuttx/shm.h

@@ -44,7 +44,7 @@
 
 #include <debug.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #ifdef CONFIG_MM_SHM
 

nuttx/include/nuttx/usb/usbdev.h

@@ -378,7 +378,7 @@ int usbdev_unregister(FAR struct usbdevclass_driver_s *driver);
  *   called to free the DMA-capable memory.
  *
  *   This functions may be simple wrappers around gran_alloc() and
- *   gran_free() (See nuttx/gran.h).  Note that the gran_free() function
+ *   gran_free() (See nuttx/mm/gran.h).  Note that the gran_free() function
  *   does require the size of the allocation to be freed; that would need
  *   to be managed in the board-specific logic.
  *

nuttx/mm/README.txt

@@ -80,7 +80,7 @@ This directory contains the NuttX memory management logic.  This include:
      granule allocator allocates memory in units of a fixed sized block ("granule").
      Allocations may be aligned to a user-provided address boundary.
 
-     The granule allocator interfaces are defined in nuttx/include/nuttx/gran.h.
+     The granule allocator interfaces are defined in nuttx/include/nuttx/mm/gran.h.
      The granule allocator consists of these files in this directory:
 
        mm_gran.h, mm_granalloc.c, mm_grancritical.c, mm_granfree.c

nuttx/mm/mm_gran/mm_gran.h

@@ -46,7 +46,7 @@
 #include <semaphore.h>
 
 #include <arch/types.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 /****************************************************************************
  * Pre-processor Definitions

nuttx/mm/mm_gran/mm_granalloc.c

@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include "mm_gran/mm_gran.h"
 

nuttx/mm/mm_gran/mm_grancritical.c

@@ -44,7 +44,7 @@
 #include <errno.h>
 
 #include <arch/irq.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include "mm_gran/mm_gran.h"
 

nuttx/mm/mm_gran/mm_granfree.c

@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include "mm_gran/mm_gran.h"
 

nuttx/mm/mm_gran/mm_graninit.c

@@ -42,7 +42,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 #include <nuttx/kmalloc.h>
 
 #include "mm_gran/mm_gran.h"

nuttx/mm/mm_gran/mm_granmark.c

@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include "mm_gran/mm_gran.h"
 

nuttx/mm/mm_gran/mm_granrelease.c

@@ -42,7 +42,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 #include <nuttx/kmalloc.h>
 
 #include "mm_gran/mm_gran.h"

nuttx/mm/mm_gran/mm_granreserve.c

@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 
 #include "mm_gran/mm_gran.h"
 

nuttx/mm/mm_gran/mm_pgalloc.c

@@ -41,7 +41,7 @@
 
 #include <assert.h>
 
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 #include <nuttx/pgalloc.h>
 
 #include "mm_gran/mm_gran.h"

nuttx/mm/shm/shm_initialize.c

@@ -44,7 +44,7 @@
 
 #include <nuttx/addrenv.h>
 #include <nuttx/sched.h>
-#include <nuttx/gran.h>
+#include <nuttx/mm/gran.h>
 #include <nuttx/pgalloc.h>
 #include <nuttx/shm.h>