Re: [PATCH 4/4] mm/arch: use NUMA_NODE

[Jianguo Wu]

Cc linux-mm@xxxxxxxxx

On 2013/8/30 10:06, Jianguo Wu wrote:

> Use more appropriate NUMA_NO_NODE instead of -1 in some archs' module_alloc()
> 
> Signed-off-by: Jianguo Wu <wujianguo@xxxxxxxxxx>
> ---
>  arch/arm/kernel/module.c    |    2 +-
>  arch/arm64/kernel/module.c  |    2 +-
>  arch/mips/kernel/module.c   |    2 +-
>  arch/parisc/kernel/module.c |    2 +-
>  arch/s390/kernel/module.c   |    2 +-
>  arch/sparc/kernel/module.c  |    2 +-
>  arch/x86/kernel/module.c    |    2 +-
>  7 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
> index 85c3fb6..8f4cff3 100644
> --- a/arch/arm/kernel/module.c
> +++ b/arch/arm/kernel/module.c
> @@ -40,7 +40,7 @@
>  void *module_alloc(unsigned long size)
>  {
>  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
> -				GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
> +				GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
>  				__builtin_return_address(0));
>  }
>  #endif
> diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c
> index ca0e3d5..8f898bd 100644
> --- a/arch/arm64/kernel/module.c
> +++ b/arch/arm64/kernel/module.c
> @@ -29,7 +29,7 @@
>  void *module_alloc(unsigned long size)
>  {
>  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
> -				    GFP_KERNEL, PAGE_KERNEL_EXEC, -1,
> +				    GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE,
>  				    __builtin_return_address(0));
>  }
>  
> diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
> index 977a623..b507e07 100644
> --- a/arch/mips/kernel/module.c
> +++ b/arch/mips/kernel/module.c
> @@ -46,7 +46,7 @@ static DEFINE_SPINLOCK(dbe_lock);
>  void *module_alloc(unsigned long size)
>  {
>  	return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
> -				GFP_KERNEL, PAGE_KERNEL, -1,
> +				GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
>  				__builtin_return_address(0));
>  }
>  #endif
> diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c
> index 2a625fb..50dfafc 100644
> --- a/arch/parisc/kernel/module.c
> +++ b/arch/parisc/kernel/module.c
> @@ -219,7 +219,7 @@ void *module_alloc(unsigned long size)
>  	 * init_data correctly */
>  	return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END,
>  				    GFP_KERNEL | __GFP_HIGHMEM,
> -				    PAGE_KERNEL_RWX, -1,
> +				    PAGE_KERNEL_RWX, NUMA_NO_NODE,
>  				    __builtin_return_address(0));
>  }
>  
> diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c
> index 7845e15..b89b591 100644
> --- a/arch/s390/kernel/module.c
> +++ b/arch/s390/kernel/module.c
> @@ -50,7 +50,7 @@ void *module_alloc(unsigned long size)
>  	if (PAGE_ALIGN(size) > MODULES_LEN)
>  		return NULL;
>  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
> -				    GFP_KERNEL, PAGE_KERNEL, -1,
> +				    GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
>  				    __builtin_return_address(0));
>  }
>  #endif
> diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c
> index 4435488..97655e0 100644
> --- a/arch/sparc/kernel/module.c
> +++ b/arch/sparc/kernel/module.c
> @@ -29,7 +29,7 @@ static void *module_map(unsigned long size)
>  	if (PAGE_ALIGN(size) > MODULES_LEN)
>  		return NULL;
>  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
> -				GFP_KERNEL, PAGE_KERNEL, -1,
> +				GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE,
>  				__builtin_return_address(0));
>  }
>  #else
> diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
> index 216a4d7..18be189 100644
> --- a/arch/x86/kernel/module.c
> +++ b/arch/x86/kernel/module.c
> @@ -49,7 +49,7 @@ void *module_alloc(unsigned long size)
>  		return NULL;
>  	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
>  				GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC,
> -				-1, __builtin_return_address(0));
> +				NUMA_NO_NODE, __builtin_return_address(0));
>  }
>  
>  #ifdef CONFIG_X86_32



--
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/