Messages in this thread Patch in this message | | | From | Santosh Shilimkar <> | Subject | [PATCH 2/2] mm/memblock: fix buld of "cris" arch | Date | Tue, 10 Dec 2013 14:29:58 -0500 |
| |
From: Grygorii Strashko <grygorii.strashko@ti.com>
The build of "criss" arch is broken after applying new memblock API series.
In file included from arch/cris/mm/init.c:13:0: include/linux/bootmem.h: In function 'memblock_virt_alloc': include/linux/bootmem.h:229:55: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h:229:55: note: each undeclared identifier is reported only once for each function it appears in include/linux/bootmem.h: In function 'memblock_virt_alloc_nopanic': include/linux/bootmem.h:237:63: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node': include/linux/bootmem.h:250:27: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node_nopanic': include/linux/bootmem.h:258:28: error: 'KSEG_C' undeclared (first use in this function)
In file included from mm/bootmem.c:14:0: include/linux/bootmem.h: In function 'memblock_virt_alloc': include/linux/bootmem.h:229:55: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h:229:55: note: each undeclared identifier is reported only once for each function it appears in include/linux/bootmem.h: In function 'memblock_virt_alloc_nopanic': include/linux/bootmem.h:237:63: error: 'KSEG_C' undeclared (first use in this function) include/linux/bootmem.h: In function 'memblock_virt_alloc_node': include/linux/bootmem.h:250:27: error: 'KSEG_C' undeclared (first use in this function)
The "cris" arch defines memory parameters in a different manner than other arch's and they are splitted between 2 headers: <asm/page.h> and <asm/mmu.h>
As result, now build is failed if "bootmem.h" included before <asm/page.h> and <asm/mmu.h>. Hence, fix it by including additional header in bootmem.h.
Cc: Yinghai Lu <yinghai@kernel.org> Cc: Tejun Heo <tj@kernel.org> Cc: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com> --- include/linux/bootmem.h | 1 + 1 file changed, 1 insertion(+)
diff --git a/include/linux/bootmem.h b/include/linux/bootmem.h index 1c9aa0e..2fae55d 100644 --- a/include/linux/bootmem.h +++ b/include/linux/bootmem.h @@ -5,6 +5,7 @@ #define _LINUX_BOOTMEM_H #include <linux/mmzone.h> +#include <linux/mm_types.h> #include <asm/dma.h> /* -- 1.7.9.5
| |