mips: module: rename MODULE_START to MODULES_VADDR

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>

authored by

Mike Rapoport (IBM) and committed by

Luis Chamberlain 2 years ago 0cdf5876 00be8758

+6 -6

3 changed files

expand all

arch

mips

include

asm

pgtable-64.h

kernel

module.c

fault.c

+2 -2

arch/mips/include/asm/pgtable-64.h

··· 147 147 #if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \ 148 148 VMALLOC_START != CKSSEG 149 149 /* Load modules into 32bit-compatible segment. */ 150 - #define MODULE_START CKSSEG 151 - #define MODULE_END (FIXADDR_START-2*PAGE_SIZE) 150 + #define MODULES_VADDR CKSSEG 151 + #define MODULES_END (FIXADDR_START-2*PAGE_SIZE) 152 152 #endif 153 153 154 154 #define pte_ERROR(e) \

+2 -2

arch/mips/kernel/module.c

··· 31 31 static LIST_HEAD(dbe_list); 32 32 static DEFINE_SPINLOCK(dbe_lock); 33 33 34 - #ifdef MODULE_START 34 + #ifdef MODULES_VADDR 35 35 void *module_alloc(unsigned long size) 36 36 { 37 - return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END, 37 + return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, 38 38 GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE, 39 39 __builtin_return_address(0)); 40 40 }

+2 -2

arch/mips/mm/fault.c

··· 83 83 84 84 if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END)) 85 85 goto VMALLOC_FAULT_TARGET; 86 - #ifdef MODULE_START 87 - if (unlikely(address >= MODULE_START && address < MODULE_END)) 86 + #ifdef MODULES_VADDR 87 + if (unlikely(address >= MODULES_VADDR && address < MODULES_END)) 88 88 goto VMALLOC_FAULT_TARGET; 89 89 #endif 90 90