mips: module: rename MODULE_START to MODULES_VADDR

and MODULE_END to MODULES_END to match other architectures that define
custom address space for modules.

Signed-off-by: Mike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>

diff --git a/arch/mips/include/asm/pgtable-64.h b/arch/mips/include/asm/pgtable-64.h
index 20ca48c1b6063e7ab2acf117c05cc24eaebe52ba..c0109aff223b0ea5c7f4ccfcc4c4999b49675033 100644 (file)
--- a/arch/mips/include/asm/pgtable-64.h
+++ b/arch/mips/include/asm/pgtable-64.h
@@ -147,8 +147,8 @@
 #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \
        VMALLOC_START != CKSSEG
 /* Load modules into 32bit-compatible segment. */
-#define MODULE_START   CKSSEG
-#define MODULE_END     (FIXADDR_START-2*PAGE_SIZE)
+#define MODULES_VADDR  CKSSEG
+#define MODULES_END    (FIXADDR_START-2*PAGE_SIZE)
 #endif
 
 #define pte_ERROR(e) \

diff --git a/arch/mips/kernel/module.c b/arch/mips/kernel/module.c
index 7b2fbaa9cac579cf27c071efaf515c0f4e225cd3..9a6c9601490434b8a062cf063a24924f39175770 100644 (file)
--- a/arch/mips/kernel/module.c
+++ b/arch/mips/kernel/module.c
@@ -31,10 +31,10 @@ struct mips_hi16 {
 static LIST_HEAD(dbe_list);
 static DEFINE_SPINLOCK(dbe_lock);
 
-#ifdef MODULE_START
+#ifdef MODULES_VADDR
 void *module_alloc(unsigned long size)
 {
-       return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
+       return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
                                GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
                                __builtin_return_address(0));
 }

diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index aaa9a242ebbabcc27ed399a736a8e3ec60fc37ae..37fedeaca2e9af72cb4b4f67e7879e63d3e998f5 100644 (file)
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -83,8 +83,8 @@ static void __do_page_fault(struct pt_regs *regs, unsigned long write,
 
        if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END))
                goto VMALLOC_FAULT_TARGET;
-#ifdef MODULE_START
-       if (unlikely(address >= MODULE_START && address < MODULE_END))
+#ifdef MODULES_VADDR
+       if (unlikely(address >= MODULES_VADDR && address < MODULES_END))
                goto VMALLOC_FAULT_TARGET;
 #endif