On Fri, Feb 08, 2019 at 02:40:47PM -0800, Andrew Morton wrote:
> On Fri, 8 Feb 2019 13:45:47 +0200 Mike Rapoport <rppt@xxxxxxxxxxxxx> wrote:
>
> > * Remove comments mentioning bootmem
> > * Extend "DOC: memblock overview"
> > * Add kernel-doc comments for several more functions
> >
> > ...
> >
> > @@ -1400,6 +1413,19 @@ phys_addr_t __init memblock_phys_alloc_range(phys_addr_t size,
> > return memblock_alloc_range_nid(size, align, start, end, NUMA_NO_NODE);
> > }
> >
> > +/**
> > + * memblock_phys_alloc_range - allocate a memory block from specified MUMA node
> > + * @size: size of memory block to be allocated in bytes
> > + * @align: alignment of the region and block's size
> > + * @nid: nid of the free area to find, %NUMA_NO_NODE for any node
> > + *
> > + * Allocates memory block from the specified NUMA node. If the node
> > + * has no available memory, attempts to allocated from any node in the
> > + * system.
> > + *
> > + * Return: physical address of the allocated memory block on success,
> > + * %0 on failure.
> > + */
> > phys_addr_t __init memblock_phys_alloc_try_nid(phys_addr_t size, phys_addr_t align, int nid)
> > {
> > return memblock_alloc_range_nid(size, align, 0,
>
> copy-n-paste!
Oops, thanks for the fix!
> --- a/mm/memblock.c~memblock-update-comments-and-kernel-doc-fix
> +++ a/mm/memblock.c
> @@ -1414,7 +1414,7 @@ phys_addr_t __init memblock_phys_alloc_r
> }
>
> /**
> - * memblock_phys_alloc_range - allocate a memory block from specified MUMA node
> + * memblock_phys_alloc_try_nid - allocate a memory block from specified MUMA node
> * @size: size of memory block to be allocated in bytes
> * @align: alignment of the region and block's size
> * @nid: nid of the free area to find, %NUMA_NO_NODE for any node
>
--
Sincerely yours,
Mike.
