Commit 0cdf5876 authored by Mike Rapoport (IBM)'s avatar Mike Rapoport (IBM) Committed by Luis Chamberlain
Browse files

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: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 00be8758

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

+2 −2
Original line number Diff line number Diff line
@@ -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) \

arch/mips/kernel/module.c

+2 −2
Original line number Diff line number Diff line
@@ -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));

}

arch/mips/mm/fault.c

+2 −2
Original line number Diff line number Diff line
@@ -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