[RFC PATCH 28/29] memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants

2018-09-05 Thread Mike Rapoport 
Drop BOOTMEM_ALLOC_ACCESSIBLE and BOOTMEM_ALLOC_ANYWHERE in favor of
identical MEMBLOCK definitions.

Signed-off-by: Mike Rapoport 
---
 arch/ia64/mm/discontig.c   | 2 +-
 arch/powerpc/kernel/setup_64.c | 2 +-
 arch/sparc/kernel/smp_64.c | 2 +-
 arch/x86/kernel/setup_percpu.c | 2 +-
 arch/x86/mm/kasan_init_64.c| 4 ++--
 mm/hugetlb.c   | 3 ++-
 mm/kasan/kasan_init.c  | 2 +-
 mm/memblock.c  | 8 
 mm/page_ext.c  | 2 +-
 mm/sparse-vmemmap.c| 3 ++-
 mm/sparse.c| 5 +++--
 11 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 918dda9..70609f8 100644
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -453,7 +453,7 @@ static void __init *memory_less_node_alloc(int nid, 
unsigned long pernodesize)
 
ptr = memblock_alloc_try_nid(pernodesize, PERCPU_PAGE_SIZE,
 __pa(MAX_DMA_ADDRESS),
-BOOTMEM_ALLOC_ACCESSIBLE,
+MEMBLOCK_ALLOC_ACCESSIBLE,
 bestnode);
 
return ptr;
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index e564b27..b3e70cc 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -758,7 +758,7 @@ void __init emergency_stack_init(void)
 static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
 {
return memblock_alloc_try_nid(size, align, __pa(MAX_DMA_ADDRESS),
- BOOTMEM_ALLOC_ACCESSIBLE,
+ MEMBLOCK_ALLOC_ACCESSIBLE,
  early_cpu_to_node(cpu));
 
 }
diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
index a087a6a..6cc80d0 100644
--- a/arch/sparc/kernel/smp_64.c
+++ b/arch/sparc/kernel/smp_64.c
@@ -1595,7 +1595,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, 
size_t size,
 cpu, size, __pa(ptr));
} else {
ptr = memblock_alloc_try_nid(size, align, goal,
-BOOTMEM_ALLOC_ACCESSIBLE, node);
+MEMBLOCK_ALLOC_ACCESSIBLE, node);
pr_debug("per cpu data for cpu%d %lu bytes on node%d at "
 "%016lx\n", cpu, size, node, __pa(ptr));
}
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
index a006f1b..483412f 100644
--- a/arch/x86/kernel/setup_percpu.c
+++ b/arch/x86/kernel/setup_percpu.c
@@ -114,7 +114,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, 
unsigned long size,
 cpu, size, __pa(ptr));
} else {
ptr = memblock_alloc_try_nid_nopanic(size, align, goal,
-BOOTMEM_ALLOC_ACCESSIBLE,
+MEMBLOCK_ALLOC_ACCESSIBLE,
 node);
 
pr_debug("per cpu data for cpu%d %lu bytes on node%d at 
%016lx\n",
diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
index 77b857c..8f87499 100644
--- a/arch/x86/mm/kasan_init_64.c
+++ b/arch/x86/mm/kasan_init_64.c
@@ -29,10 +29,10 @@ static __init void *early_alloc(size_t size, int nid, bool 
panic)
 {
if (panic)
return memblock_alloc_try_nid(size, size,
-   __pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
+   __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
else
return memblock_alloc_try_nid_nopanic(size, size,
-   __pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
+   __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
 }
 
 static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr,
diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 3f5419c..ee0b140 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2102,7 +2103,7 @@ int __alloc_bootmem_huge_page(struct hstate *h)
 
addr = memblock_alloc_try_nid_raw(
huge_page_size(h), huge_page_size(h),
-   0, BOOTMEM_ALLOC_ACCESSIBLE, node);
+   0, MEMBLOCK_ALLOC_ACCESSIBLE, node);
if (addr) {
/*
 * Use the beginning of the huge page to store the
diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c
index 24d734b..785a970 100644
--- a/mm/kasan/kasan_init.c
+++ b/mm/kasan/kasan_init.c
@@ -84,7 +84,7 @@ static inline bool kasan_zero_page_entry(pte_t pte)
 static __init void *early_alloc(size_t size, int node)
 {
return memblock_

Re: [RFC PATCH 28/29] memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants

2018-09-06 Thread Michal Hocko 
On Wed 05-09-18 18:59:43, Mike Rapoport wrote:
> Drop BOOTMEM_ALLOC_ACCESSIBLE and BOOTMEM_ALLOC_ANYWHERE in favor of
> identical MEMBLOCK definitions.
> 
> Signed-off-by: Mike Rapoport 

Acked-by: Michal Hocko 

> ---
>  arch/ia64/mm/discontig.c   | 2 +-
>  arch/powerpc/kernel/setup_64.c | 2 +-
>  arch/sparc/kernel/smp_64.c | 2 +-
>  arch/x86/kernel/setup_percpu.c | 2 +-
>  arch/x86/mm/kasan_init_64.c| 4 ++--
>  mm/hugetlb.c   | 3 ++-
>  mm/kasan/kasan_init.c  | 2 +-
>  mm/memblock.c  | 8 
>  mm/page_ext.c  | 2 +-
>  mm/sparse-vmemmap.c| 3 ++-
>  mm/sparse.c| 5 +++--
>  11 files changed, 19 insertions(+), 16 deletions(-)
> 
> diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
> index 918dda9..70609f8 100644
> --- a/arch/ia64/mm/discontig.c
> +++ b/arch/ia64/mm/discontig.c
> @@ -453,7 +453,7 @@ static void __init *memory_less_node_alloc(int nid, 
> unsigned long pernodesize)
>  
>   ptr = memblock_alloc_try_nid(pernodesize, PERCPU_PAGE_SIZE,
>__pa(MAX_DMA_ADDRESS),
> -  BOOTMEM_ALLOC_ACCESSIBLE,
> +  MEMBLOCK_ALLOC_ACCESSIBLE,
>bestnode);
>  
>   return ptr;
> diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
> index e564b27..b3e70cc 100644
> --- a/arch/powerpc/kernel/setup_64.c
> +++ b/arch/powerpc/kernel/setup_64.c
> @@ -758,7 +758,7 @@ void __init emergency_stack_init(void)
>  static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t 
> align)
>  {
>   return memblock_alloc_try_nid(size, align, __pa(MAX_DMA_ADDRESS),
> -   BOOTMEM_ALLOC_ACCESSIBLE,
> +   MEMBLOCK_ALLOC_ACCESSIBLE,
> early_cpu_to_node(cpu));
>  
>  }
> diff --git a/arch/sparc/kernel/smp_64.c b/arch/sparc/kernel/smp_64.c
> index a087a6a..6cc80d0 100644
> --- a/arch/sparc/kernel/smp_64.c
> +++ b/arch/sparc/kernel/smp_64.c
> @@ -1595,7 +1595,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int 
> cpu, size_t size,
>cpu, size, __pa(ptr));
>   } else {
>   ptr = memblock_alloc_try_nid(size, align, goal,
> -  BOOTMEM_ALLOC_ACCESSIBLE, node);
> +  MEMBLOCK_ALLOC_ACCESSIBLE, node);
>   pr_debug("per cpu data for cpu%d %lu bytes on node%d at "
>"%016lx\n", cpu, size, node, __pa(ptr));
>   }
> diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c
> index a006f1b..483412f 100644
> --- a/arch/x86/kernel/setup_percpu.c
> +++ b/arch/x86/kernel/setup_percpu.c
> @@ -114,7 +114,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, 
> unsigned long size,
>cpu, size, __pa(ptr));
>   } else {
>   ptr = memblock_alloc_try_nid_nopanic(size, align, goal,
> -  BOOTMEM_ALLOC_ACCESSIBLE,
> +  MEMBLOCK_ALLOC_ACCESSIBLE,
>node);
>  
>   pr_debug("per cpu data for cpu%d %lu bytes on node%d at 
> %016lx\n",
> diff --git a/arch/x86/mm/kasan_init_64.c b/arch/x86/mm/kasan_init_64.c
> index 77b857c..8f87499 100644
> --- a/arch/x86/mm/kasan_init_64.c
> +++ b/arch/x86/mm/kasan_init_64.c
> @@ -29,10 +29,10 @@ static __init void *early_alloc(size_t size, int nid, 
> bool panic)
>  {
>   if (panic)
>   return memblock_alloc_try_nid(size, size,
> - __pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
> + __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
>   else
>   return memblock_alloc_try_nid_nopanic(size, size,
> - __pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
> + __pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
>  }
>  
>  static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr,
> diff --git a/mm/hugetlb.c b/mm/hugetlb.c
> index 3f5419c..ee0b140 100644
> --- a/mm/hugetlb.c
> +++ b/mm/hugetlb.c
> @@ -16,6 +16,7 @@
>  #include 
>  #include 
>  #include 
> +#include 
>  #include 
>  #include 
>  #include 
> @@ -2102,7 +2103,7 @@ int __alloc_bootmem_huge_page(struct hstate *h)
>  
>   addr = memblock_alloc_try_nid_raw(
>   huge_page_size(h), huge_page_size(h),
> - 0, BOOTMEM_ALLOC_ACCESSIBLE, node);
> + 0, MEMBLOCK_ALLOC_ACCESSIBLE, node);
>   if (addr) {
>   /*
>* Use the beginning of the huge page to store the
> diff --git a/mm/kasan/kasan_init.c b/mm/kasan/kasan_init.c
> index 24d734b