[PATCH 29/31] memblock: Prepare to include linux/memblock.h in core file
in [Kernel]
|
Prev: [PATCH 20/31] memblock: Add arch function to control coalescing of memblock memory regions
Next: [PATCH 01/31] memblock: Rename memblock_region to memblock_type and memblock_property to memblock_region
From: Yinghai Lu on 22 Jul 2010 14:30 Need to add protection in linux/memblock.h, to prepare to include it in mm/page_alloc.c and mm/bootmem.c etc. Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> --- include/linux/memblock.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 89749c4..4aaaf0d 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -2,6 +2,7 @@ #define _LINUX_MEMBLOCK_H #ifdef __KERNEL__ +#ifdef CONFIG_HAVE_MEMBLOCK /* * Logical memory blocks. * @@ -147,6 +148,8 @@ static inline unsigned long memblock_region_pages(const struct memblock_region * region++) +#endif /* CONFIG_HAVE_MEMBLOCK */ + #endif /* __KERNEL__ */ #endif /* _LINUX_MEMBLOCK_H */ -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |