diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 06:55:26 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-24 06:55:26 -0600 |
commit | 261eb94ddc9dcb411212b864483709584f73fc50 (patch) | |
tree | 78669df8df2878c3aa84ce3526c6dfd00aca2d07 /nuttx/mm | |
parent | 3fb7993ff6f2fc7a7eef32466c37ed84352d87bc (diff) | |
download | px4-nuttx-261eb94ddc9dcb411212b864483709584f73fc50.tar.gz px4-nuttx-261eb94ddc9dcb411212b864483709584f73fc50.tar.bz2 px4-nuttx-261eb94ddc9dcb411212b864483709584f73fc50.zip |
Move include/nuttx/gran.h to include/nuttx/mm/gran.h
Diffstat (limited to 'nuttx/mm')
-rw-r--r-- | nuttx/mm/README.txt | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_gran.h | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_granalloc.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_grancritical.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_granfree.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_graninit.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_granmark.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_granrelease.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_granreserve.c | 2 | ||||
-rw-r--r-- | nuttx/mm/mm_gran/mm_pgalloc.c | 2 | ||||
-rw-r--r-- | nuttx/mm/shm/shm_initialize.c | 2 |
11 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/mm/README.txt b/nuttx/mm/README.txt index 3d0ec9eec..e604cee7e 100644 --- a/nuttx/mm/README.txt +++ b/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 diff --git a/nuttx/mm/mm_gran/mm_gran.h b/nuttx/mm/mm_gran/mm_gran.h index cb9316ae4..20229216b 100644 --- a/nuttx/mm/mm_gran/mm_gran.h +++ b/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 diff --git a/nuttx/mm/mm_gran/mm_granalloc.c b/nuttx/mm/mm_gran/mm_granalloc.c index cc4a9cb6d..2910f8286 100644 --- a/nuttx/mm/mm_gran/mm_granalloc.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_grancritical.c b/nuttx/mm/mm_gran/mm_grancritical.c index 04d2de35c..ae16a3984 100644 --- a/nuttx/mm/mm_gran/mm_grancritical.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_granfree.c b/nuttx/mm/mm_gran/mm_granfree.c index 707dbaa2d..d2df5cd4d 100644 --- a/nuttx/mm/mm_gran/mm_granfree.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_graninit.c b/nuttx/mm/mm_gran/mm_graninit.c index 79d288370..0d4bf18b7 100644 --- a/nuttx/mm/mm_gran/mm_graninit.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_granmark.c b/nuttx/mm/mm_gran/mm_granmark.c index 805dbc1da..91bfdb097 100644 --- a/nuttx/mm/mm_gran/mm_granmark.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_granrelease.c b/nuttx/mm/mm_gran/mm_granrelease.c index 1c228fa53..a7b8c25a0 100644 --- a/nuttx/mm/mm_gran/mm_granrelease.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_granreserve.c b/nuttx/mm/mm_gran/mm_granreserve.c index bf73671c3..6becbd0f0 100644 --- a/nuttx/mm/mm_gran/mm_granreserve.c +++ b/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" diff --git a/nuttx/mm/mm_gran/mm_pgalloc.c b/nuttx/mm/mm_gran/mm_pgalloc.c index 67e8653f4..6f7b33acd 100644 --- a/nuttx/mm/mm_gran/mm_pgalloc.c +++ b/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" diff --git a/nuttx/mm/shm/shm_initialize.c b/nuttx/mm/shm/shm_initialize.c index de942793c..af3170c47 100644 --- a/nuttx/mm/shm/shm_initialize.c +++ b/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> |