Message ID | 1536163184-26356-9-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:23, Mike Rapoport wrote: > The functions are equivalent, just the later does not require nobootmem > translation layer. > > Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Acked-by: Michal Hocko <mhocko@suse.com> > --- > arch/x86/xen/p2m.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c > index 159a897..68c0f14 100644 > --- a/arch/x86/xen/p2m.c > +++ b/arch/x86/xen/p2m.c > @@ -180,7 +180,7 @@ static void p2m_init_identity(unsigned long *p2m, unsigned long pfn) > static void * __ref alloc_p2m_page(void) > { > if (unlikely(!slab_is_available())) > - return alloc_bootmem_align(PAGE_SIZE, PAGE_SIZE); > + return memblock_alloc(PAGE_SIZE, PAGE_SIZE); > > return (void *)__get_free_page(GFP_KERNEL); > } > -- > 2.7.4
diff --git a/arch/x86/xen/p2m.c b/arch/x86/xen/p2m.c index 159a897..68c0f14 100644 --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c @@ -180,7 +180,7 @@ static void p2m_init_identity(unsigned long *p2m, unsigned long pfn) static void * __ref alloc_p2m_page(void) { if (unlikely(!slab_is_available())) - return alloc_bootmem_align(PAGE_SIZE, PAGE_SIZE); + return memblock_alloc(PAGE_SIZE, PAGE_SIZE); return (void *)__get_free_page(GFP_KERNEL); }
The functions are equivalent, just the later does not require nobootmem translation layer. Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> --- arch/x86/xen/p2m.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)