Prev: memblock: Export MEMBLOCK_ERROR again
Next: x86, vdso: Error out if the vdso contains external references
From: Benjamin Herrenschmidt on 28 Jul 2010 01:30 On Thu, 2010-07-22 at 11:21 -0700, Yinghai Lu wrote: > Need to add protection in linux/memblock.h, to prepare to include it in > mm/page_alloc.c and mm/bootmem.c etc. Not really no ... having the definitions shouldn't hurt whether memblock is used or not, no ? I'm going to keep that patch in the queue because it has one advantage that you don't mention, which is to more easily catch attempts to use those functions when CONFIG_HAVE_MEMBLOCK isn't set, but I'll update the commit message. Ben. > 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 */ -- 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/ |