diff options
author | Jianguo Wu <wujianguo@huawei.com> | 2013-11-12 18:07:27 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-11-12 22:09:05 -0500 |
commit | 40c3baa7c66f1352521378ee83509fb8f4c465de (patch) | |
tree | a1f197679055cd3753c366e11b9063aa58bfd00f /arch | |
parent | 03b61ff3c324e094944b663cc611a8bab252539c (diff) |
mm/arch: use NUMA_NO_NODE
Use more appropriate NUMA_NO_NODE instead of -1 in all archs' module_alloc()
Signed-off-by: Jianguo Wu <wujianguo@huawei.com>
Acked-by: David Rientjes <rientjes@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/kernel/module.c | 2 | ||||
-rw-r--r-- | arch/arm64/kernel/module.c | 2 | ||||
-rw-r--r-- | arch/parisc/kernel/module.c | 2 | ||||
-rw-r--r-- | arch/s390/kernel/module.c | 2 | ||||
-rw-r--r-- | arch/sparc/kernel/module.c | 2 | ||||
-rw-r--r-- | arch/x86/kernel/module.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c index 084dc8896986..c9dfff3b8008 100644 --- a/arch/arm/kernel/module.c +++ b/arch/arm/kernel/module.c | |||
@@ -40,7 +40,7 @@ | |||
40 | void *module_alloc(unsigned long size) | 40 | void *module_alloc(unsigned long size) |
41 | { | 41 | { |
42 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, | 42 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, |
43 | GFP_KERNEL, PAGE_KERNEL_EXEC, -1, | 43 | GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE, |
44 | __builtin_return_address(0)); | 44 | __builtin_return_address(0)); |
45 | } | 45 | } |
46 | #endif | 46 | #endif |
diff --git a/arch/arm64/kernel/module.c b/arch/arm64/kernel/module.c index 2c28a6cf93e6..e2ad0d87721f 100644 --- a/arch/arm64/kernel/module.c +++ b/arch/arm64/kernel/module.c | |||
@@ -29,7 +29,7 @@ | |||
29 | void *module_alloc(unsigned long size) | 29 | void *module_alloc(unsigned long size) |
30 | { | 30 | { |
31 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, | 31 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, |
32 | GFP_KERNEL, PAGE_KERNEL_EXEC, -1, | 32 | GFP_KERNEL, PAGE_KERNEL_EXEC, NUMA_NO_NODE, |
33 | __builtin_return_address(0)); | 33 | __builtin_return_address(0)); |
34 | } | 34 | } |
35 | 35 | ||
diff --git a/arch/parisc/kernel/module.c b/arch/parisc/kernel/module.c index 2a625fb063e1..50dfafc3f2c1 100644 --- a/arch/parisc/kernel/module.c +++ b/arch/parisc/kernel/module.c | |||
@@ -219,7 +219,7 @@ void *module_alloc(unsigned long size) | |||
219 | * init_data correctly */ | 219 | * init_data correctly */ |
220 | return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, | 220 | return __vmalloc_node_range(size, 1, VMALLOC_START, VMALLOC_END, |
221 | GFP_KERNEL | __GFP_HIGHMEM, | 221 | GFP_KERNEL | __GFP_HIGHMEM, |
222 | PAGE_KERNEL_RWX, -1, | 222 | PAGE_KERNEL_RWX, NUMA_NO_NODE, |
223 | __builtin_return_address(0)); | 223 | __builtin_return_address(0)); |
224 | } | 224 | } |
225 | 225 | ||
diff --git a/arch/s390/kernel/module.c b/arch/s390/kernel/module.c index 7845e15a17df..b89b59158b95 100644 --- a/arch/s390/kernel/module.c +++ b/arch/s390/kernel/module.c | |||
@@ -50,7 +50,7 @@ void *module_alloc(unsigned long size) | |||
50 | if (PAGE_ALIGN(size) > MODULES_LEN) | 50 | if (PAGE_ALIGN(size) > MODULES_LEN) |
51 | return NULL; | 51 | return NULL; |
52 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, | 52 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, |
53 | GFP_KERNEL, PAGE_KERNEL, -1, | 53 | GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE, |
54 | __builtin_return_address(0)); | 54 | __builtin_return_address(0)); |
55 | } | 55 | } |
56 | #endif | 56 | #endif |
diff --git a/arch/sparc/kernel/module.c b/arch/sparc/kernel/module.c index 4435488ebe25..97655e0fd243 100644 --- a/arch/sparc/kernel/module.c +++ b/arch/sparc/kernel/module.c | |||
@@ -29,7 +29,7 @@ static void *module_map(unsigned long size) | |||
29 | if (PAGE_ALIGN(size) > MODULES_LEN) | 29 | if (PAGE_ALIGN(size) > MODULES_LEN) |
30 | return NULL; | 30 | return NULL; |
31 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, | 31 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, |
32 | GFP_KERNEL, PAGE_KERNEL, -1, | 32 | GFP_KERNEL, PAGE_KERNEL, NUMA_NO_NODE, |
33 | __builtin_return_address(0)); | 33 | __builtin_return_address(0)); |
34 | } | 34 | } |
35 | #else | 35 | #else |
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c index 216a4d754b0c..18be189368bb 100644 --- a/arch/x86/kernel/module.c +++ b/arch/x86/kernel/module.c | |||
@@ -49,7 +49,7 @@ void *module_alloc(unsigned long size) | |||
49 | return NULL; | 49 | return NULL; |
50 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, | 50 | return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, |
51 | GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC, | 51 | GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL_EXEC, |
52 | -1, __builtin_return_address(0)); | 52 | NUMA_NO_NODE, __builtin_return_address(0)); |
53 | } | 53 | } |
54 | 54 | ||
55 | #ifdef CONFIG_X86_32 | 55 | #ifdef CONFIG_X86_32 |