| Message ID | 1536163184-26356-12-git-send-email-rppt@linux.vnet.ibm.com |
|---|---|
| State | RFC |
| Delegated to: | David Miller |
| Headers | show |
| Series | mm: remove bootmem allocator | expand |
On Wed 05-09-18 18:59:26, Mike Rapoport wrote: > The alloc_bootmem_pages_nopanic(size) is a shortcut for > __alloc_bootmem_nopanic(x, PAGE_SIZE, BOOTMEM_LOW_LIMIT) and can be > replaced by memblock_alloc_nopanic(size, PAGE_SIZE) It is not so straightforward because you really have to go deep down the callpath to see they are doing the same thing essentially. > Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Acked-by: Michal Hocko <mhocko@suse.com> > --- > drivers/usb/early/xhci-dbc.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c > index e15e896..16df968 100644 > --- a/drivers/usb/early/xhci-dbc.c > +++ b/drivers/usb/early/xhci-dbc.c > @@ -94,7 +94,7 @@ static void * __init xdbc_get_page(dma_addr_t *dma_addr) > { > void *virt; > > - virt = alloc_bootmem_pages_nopanic(PAGE_SIZE); > + virt = memblock_alloc_nopanic(PAGE_SIZE, PAGE_SIZE); > if (!virt) > return NULL; > > -- > 2.7.4 >
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c index e15e896..16df968 100644 --- a/drivers/usb/early/xhci-dbc.c +++ b/drivers/usb/early/xhci-dbc.c @@ -94,7 +94,7 @@ static void * __init xdbc_get_page(dma_addr_t *dma_addr) { void *virt; - virt = alloc_bootmem_pages_nopanic(PAGE_SIZE); + virt = memblock_alloc_nopanic(PAGE_SIZE, PAGE_SIZE); if (!virt) return NULL;
The alloc_bootmem_pages_nopanic(size) is a shortcut for __alloc_bootmem_nopanic(x, PAGE_SIZE, BOOTMEM_LOW_LIMIT) and can be replaced by memblock_alloc_nopanic(size, PAGE_SIZE) Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> --- drivers/usb/early/xhci-dbc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)