Skip to content

Commit 0cdf587

Browse files
rpptmcgrof
authored andcommitted
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) <[email protected]> Signed-off-by: Luis Chamberlain <[email protected]>
1 parent 00be875 commit 0cdf587

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@
147147
#if defined(CONFIG_MODULES) && defined(KBUILD_64BIT_SYM32) && \
148148
VMALLOC_START != CKSSEG
149149
/* 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)
152152
#endif
153153

154154
#define pte_ERROR(e) \

arch/mips/kernel/module.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ struct mips_hi16 {
3131
static LIST_HEAD(dbe_list);
3232
static DEFINE_SPINLOCK(dbe_lock);
3333

34-
#ifdef MODULE_START
34+
#ifdef MODULES_VADDR
3535
void *module_alloc(unsigned long size)
3636
{
37-
return __vmalloc_node_range(size, 1, MODULE_START, MODULE_END,
37+
return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,
3838
GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,
3939
__builtin_return_address(0));
4040
}

arch/mips/mm/fault.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,8 @@ static void __do_page_fault(struct pt_regs *regs, unsigned long write,
8383

8484
if (unlikely(address >= VMALLOC_START && address <= VMALLOC_END))
8585
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))
8888
goto VMALLOC_FAULT_TARGET;
8989
#endif
9090

0 commit comments

Comments
 (0)