Merge branch 'common/mmcif' into rmobile-latest

1 files changed, 3 insertions, 11 deletions

diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 6f51dda87fce..d87a72e9fac7 100644
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -46,17 +46,9 @@ static DEFINE_SPINLOCK(dbe_lock);
 void *module_alloc(unsigned long size)
 {
 #ifdef MODULE_START
-        struct vm_struct *area;
-
-        size = PAGE_ALIGN(size);
-        if (!size)
-                return NULL;
-
-        area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END);
-        if (!area)
-                return NULL;
-
-        return __vmalloc_area(area, GFP_KERNEL, PAGE_KERNEL);
+        return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+                                GFP_KERNEL, PAGE_KERNEL, -1,
+                                __builtin_return_address(0));
 #else
         if (size == 0)
                 return NULL;