]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
mm/arch: use NUMA_NO_NODE
authorJianguo Wu <wujianguo@huawei.com>
Tue, 12 Nov 2013 23:07:27 +0000 (15:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Nov 2013 03:09:05 +0000 (12:09 +0900)
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>
arch/arm/kernel/module.c
arch/arm64/kernel/module.c
arch/parisc/kernel/module.c
arch/s390/kernel/module.c
arch/sparc/kernel/module.c
arch/x86/kernel/module.c

index 084dc8896986f321247fc590b9f348cb47872eff..c9dfff3b80082e60fa2244efd1a23216293356ec 100644 (file)
@@ -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
index 2c28a6cf93e610a9484442f662c5975a180b7790..e2ad0d87721f74590e1c92be20cf1cc8fc6c6e52 100644 (file)
@@ -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));
 }
 
index 2a625fb063e1537bcdff9dd18cc10dde87ec535f..50dfafc3f2c103aa3567f2fb88aeb94865847517 100644 (file)
@@ -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));
 }
 
index 7845e15a17df230285044265759e60572895373b..b89b59158b9592317479422b14cfb8e7779fa722 100644 (file)
@@ -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
index 4435488ebe258580afd7177dc61579e2c3727044..97655e0fd2438cdee8188bb4748a3c1c87f825fa 100644 (file)
@@ -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
index 216a4d754b0c7b2b01a822928ddb7a802a1bca8b..18be189368bbfdbf55cc2e7492c0e7b3b2514403 100644 (file)
@@ -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