Re: [PATCH 1/2] memblock: add error return when CONFIG_HAVE_MEMBLOCKis not set

[Mike Travis]

Yinghai Lu wrote:
> On Wed, Mar 30, 2011 at 5:41 PM, Mike Travis <travis@xxxxxxx> wrote:
> > Subject: memblock: add error return when CONFIG_HAVE_MEMBLOCK is not set
> > Author: Yinghai Lu <yinghai@xxxxxxxxxx>
> >
> >        Add an error return if CONFIG_HAVE_MEMBLOCK is not set instead
> >        of having to add #ifdef CONFIG_HAVE_MEMBLOCK around blocks of
> >        code calling that function.
> >
> > Signed-off-by: Mike Travis <travis@xxxxxxx>
> > ---
> > include/linux/memblock.h |    9 ++++++++-
> > 1 file changed, 8 insertions(+), 1 deletion(-)
> >
> > --- linux.orig/include/linux/memblock.h
> > +++ linux/include/linux/memblock.h
> > @@ -2,6 +2,8 @@
> > #define _LINUX_MEMBLOCK_H
> > #ifdef __KERNEL__
> >
> > +#define MEMBLOCK_ERROR 0
> > +
> > #ifdef CONFIG_HAVE_MEMBLOCK
> > /*
> >  * Logical memory blocks.
> > @@ -20,7 +22,6 @@
> > #include <asm/memblock.h>
> >
> > #define INIT_MEMBLOCK_REGIONS   128
> > -#define MEMBLOCK_ERROR         0
> >
> > struct memblock_region {
> >        phys_addr_t base;
> > @@ -160,6 +161,12 @@ static inline unsigned long memblock_reg
> > #define __initdata_memblock
> > #endif
> >
> > +#else
> > +static inline phys_addr_t memblock_alloc(phys_addr_t size, phys_addr_t
> > align)
> > +{
> > +       return MEMBLOCK_ERROR;
> > +}
> > +
> > #endif /* CONFIG_HAVE_MEMBLOCK */
> >
> > #endif /* __KERNEL__ */
>
> setup_log_buf will pass function pointer, So this one is not needed, right?

The other function would need the #ifdef CONFIG_HAVE_MEMBLOCK before calling
memblock_alloc which I thought was the point of this patch?  Note we still
have the last fallback of using alloc_boot_mem in kernel/init.c.

Thanks,
Mike
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/