diff --git a/ChangeLog b/ChangeLog index 8d125fa20c..a6c6edfa65 100755 --- a/ChangeLog +++ b/ChangeLog @@ -8609,5 +8609,5 @@ definitions, types, prototypes (2014-9-22). * fs/smartfs/smartfs_smart.c: SMART FS update from Ken Pettit (2014-9-22). - * mm/mm_gran/: Move granuale allocator and page allocator from mm/. to + * mm/mm_gran/: Move granule allocator and page allocator from mm/. to mm/mm_gran/. (2014-9-22). diff --git a/mm/Makefile b/mm/Makefile index 2aa90e5e43..65c061c2e5 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -77,24 +77,7 @@ ifeq ($(CONFIG_BUILD_KERNEL),y) CSRCS += umm_sbrk.c endif -# Kernel allocator - -ifeq ($(CONFIG_MM_KERNEL_HEAP),y) -CSRCS += kmm_initialize.c kmm_addregion.c kmm_sem.c -CSRCS += kmm_brkaddr.c kmm_calloc.c kmm_extend.c kmm_free.c kmm_mallinfo.c -CSRCS += kmm_malloc.c kmm_memalign.c kmm_realloc.c kmm_zalloc.c - -ifeq ($(CONFIG_BUILD_KERNEL),y) -CSRCS += kmm_sbrk.c -endif - -ifeq ($(CONFIG_DEBUG),y) -CSRCS += kmm_heapmember.c -endif -endif - -# An optional granule allocator - +include kmm_heap/Make.defs include mm_gran/Make.defs BINDIR ?= bin diff --git a/mm/kmm_addregion.c b/mm/kmm_heap/kmm_addregion.c similarity index 99% rename from mm/kmm_addregion.c rename to mm/kmm_heap/kmm_addregion.c index 574a983f64..da1068ceed 100644 --- a/mm/kmm_addregion.c +++ b/mm/kmm_heap/kmm_addregion.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_addregion.c + * mm/kmm_heap/kmm_addregion.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_brkaddr.c b/mm/kmm_heap/kmm_brkaddr.c similarity index 98% rename from mm/kmm_brkaddr.c rename to mm/kmm_heap/kmm_brkaddr.c index 463744a2aa..34c8855dfe 100644 --- a/mm/kmm_brkaddr.c +++ b/mm/kmm_heap/kmm_brkaddr.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_breakaddr.c + * mm/kmm_heap/kmm_breakaddr.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_calloc.c b/mm/kmm_heap/kmm_calloc.c similarity index 99% rename from mm/kmm_calloc.c rename to mm/kmm_heap/kmm_calloc.c index db8ac185fc..070ed568cd 100644 --- a/mm/kmm_calloc.c +++ b/mm/kmm_heap/kmm_calloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_calloc.c + * mm/kmm_heap/kmm_calloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_extend.c b/mm/kmm_heap/kmm_extend.c similarity index 99% rename from mm/kmm_extend.c rename to mm/kmm_heap/kmm_extend.c index 1ae1e28650..e0a6c701fe 100644 --- a/mm/kmm_extend.c +++ b/mm/kmm_heap/kmm_extend.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_extend.c + * mm/kmm_heap/kmm_extend.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_free.c b/mm/kmm_heap/kmm_free.c similarity index 99% rename from mm/kmm_free.c rename to mm/kmm_heap/kmm_free.c index 92b0059ba6..15b9f8ac41 100644 --- a/mm/kmm_free.c +++ b/mm/kmm_heap/kmm_free.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_free.c + * mm/kmm_heap/kmm_free.c * * Copyright (C) 2007, 2009, 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_heapmember.c b/mm/kmm_heap/kmm_heapmember.c similarity index 99% rename from mm/kmm_heapmember.c rename to mm/kmm_heap/kmm_heapmember.c index a91a6a6678..2a1ca7c00b 100644 --- a/mm/kmm_heapmember.c +++ b/mm/kmm_heap/kmm_heapmember.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_heapmember.c + * mm/kmm_heap/kmm_heapmember.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_initialize.c b/mm/kmm_heap/kmm_initialize.c similarity index 99% rename from mm/kmm_initialize.c rename to mm/kmm_heap/kmm_initialize.c index 591c767156..deeb0e25fc 100644 --- a/mm/kmm_initialize.c +++ b/mm/kmm_heap/kmm_initialize.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_initialize.c + * mm/kmm_heap/kmm_initialize.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_kernel.c b/mm/kmm_heap/kmm_kernel.c similarity index 99% rename from mm/kmm_kernel.c rename to mm/kmm_heap/kmm_kernel.c index 646cafa6cb..4ab8e1b2bc 100644 --- a/mm/kmm_kernel.c +++ b/mm/kmm_heap/kmm_kernel.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_kernel.c + * mm/kmm_heap/kmm_kernel.c * * Copyright (C) 2013-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_mallinfo.c b/mm/kmm_heap/kmm_mallinfo.c similarity index 99% rename from mm/kmm_mallinfo.c rename to mm/kmm_heap/kmm_mallinfo.c index d7c3ab4750..8a0ddf0e86 100644 --- a/mm/kmm_mallinfo.c +++ b/mm/kmm_heap/kmm_mallinfo.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_mallinfo.c + * mm/kmm_heap/kmm_mallinfo.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_malloc.c b/mm/kmm_heap/kmm_malloc.c similarity index 99% rename from mm/kmm_malloc.c rename to mm/kmm_heap/kmm_malloc.c index 65d1a5f4e2..22b5d4894b 100644 --- a/mm/kmm_malloc.c +++ b/mm/kmm_heap/kmm_malloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_malloc.c + * mm/kmm_heap/kmm_malloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_memalign.c b/mm/kmm_heap/kmm_memalign.c similarity index 99% rename from mm/kmm_memalign.c rename to mm/kmm_heap/kmm_memalign.c index 783ea9ff4a..b74c408662 100644 --- a/mm/kmm_memalign.c +++ b/mm/kmm_heap/kmm_memalign.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_memalign.c + * mm/kmm_heap/kmm_memalign.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_realloc.c b/mm/kmm_heap/kmm_realloc.c similarity index 99% rename from mm/kmm_realloc.c rename to mm/kmm_heap/kmm_realloc.c index fdb77da3fc..f41e69182d 100644 --- a/mm/kmm_realloc.c +++ b/mm/kmm_heap/kmm_realloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_realloc.c + * mm/kmm_heap/kmm_realloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_sbrk.c b/mm/kmm_heap/kmm_sbrk.c similarity index 99% rename from mm/kmm_sbrk.c rename to mm/kmm_heap/kmm_sbrk.c index 90c9b66276..59dd810e9f 100755 --- a/mm/kmm_sbrk.c +++ b/mm/kmm_heap/kmm_sbrk.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_sbrk.c + * mm/kmm_heap/kmm_sbrk.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_sem.c b/mm/kmm_heap/kmm_sem.c similarity index 99% rename from mm/kmm_sem.c rename to mm/kmm_heap/kmm_sem.c index 7883a6e56e..3a274bc041 100644 --- a/mm/kmm_sem.c +++ b/mm/kmm_heap/kmm_sem.c @@ -1,5 +1,5 @@ /************************************************************************ - * mm/kmm_sem.c + * mm/kmm_heap/kmm_sem.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/mm/kmm_zalloc.c b/mm/kmm_heap/kmm_zalloc.c similarity index 99% rename from mm/kmm_zalloc.c rename to mm/kmm_heap/kmm_zalloc.c index 9cbc5081a8..af70afe9ce 100644 --- a/mm/kmm_zalloc.c +++ b/mm/kmm_heap/kmm_zalloc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * mm/kmm_zalloc.c + * mm/kmm_heap/kmm_zalloc.c * * Copyright (C) 2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt