Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab4f2ee1 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] fix naming of MODULE_START / MODULE_END 



As of 73bdf0a6, the kernel needs
to know where modules are located in the virtual address space.
On ARM, we located this region between MODULE_START and MODULE_END.
Unfortunately, everyone else calls it MODULES_VADDR and MODULES_END.
Update ARM to use the same naming, so is_vmalloc_or_module_addr()
can work properly.  Also update the comment on mm/vmalloc.c to
reflect that ARM also places modules in a separate region from the
vmalloc space.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent d2ed5cb8

arch/arm/include/asm/memory.h

+6 −6
Original line number Diff line number Diff line
@@ -44,10 +44,10 @@ 
 * The module space lives between the addresses given by TASK_SIZE

 * and PAGE_OFFSET - it must be within 32MB of the kernel text.

 */

#define MODULE_END		(PAGE_OFFSET)

#define MODULE_START		(MODULE_END - 16*1048576)

#define MODULES_END		(PAGE_OFFSET)

#define MODULES_VADDR		(MODULES_END - 16*1048576)



#if TASK_SIZE > MODULE_START

#if TASK_SIZE > MODULES_VADDR

#error Top of user space clashes with start of module space

#endif
@@ -56,7 +56,7 @@ 
 * Since we use sections to map it, this macro replaces the physical address

 * with its virtual address while keeping offset from the base section.

 */

#define XIP_VIRT_ADDR(physaddr)  (MODULE_START + ((physaddr) & 0x000fffff))

#define XIP_VIRT_ADDR(physaddr)  (MODULES_VADDR + ((physaddr) & 0x000fffff))



/*

 * Allow 16MB-aligned ioremap pages
@@ -94,8 +94,8 @@ 
/*

 * The module can be at any place in ram in nommu mode.

 */

#define MODULE_END		(END_MEM)

#define MODULE_START		(PHYS_OFFSET)

#define MODULES_END		(END_MEM)

#define MODULES_VADDR		(PHYS_OFFSET)



#endif /* !CONFIG_MMU */

arch/arm/kernel/module.c

+4 −4
Original line number Diff line number Diff line
@@ -26,12 +26,12 @@ 
/*

 * The XIP kernel text is mapped in the module area for modules and

 * some other stuff to work without any indirect relocations.

 * MODULE_START is redefined here and not in asm/memory.h to avoid

 * MODULES_VADDR is redefined here and not in asm/memory.h to avoid

 * recompiling the whole kernel when CONFIG_XIP_KERNEL is turned on/off.

 */

extern void _etext;

#undef MODULE_START

#define MODULE_START	(((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK)

#undef MODULES_VADDR

#define MODULES_VADDR	(((unsigned long)&_etext + ~PGDIR_MASK) & PGDIR_MASK)

#endif



#ifdef CONFIG_MMU
@@ -43,7 +43,7 @@ void *module_alloc(unsigned long size) 
	if (!size)

		return NULL;



	area = __get_vm_area(size, VM_ALLOC, MODULE_START, MODULE_END);

	area = __get_vm_area(size, VM_ALLOC, MODULES_VADDR, MODULES_END);

	if (!area)

		return NULL;

arch/arm/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ static inline void prepare_page_table(struct meminfo *mi) 
	/*

	 * Clear out all the mappings below the kernel image.

	 */

	for (addr = 0; addr < MODULE_START; addr += PGDIR_SIZE)

	for (addr = 0; addr < MODULES_VADDR; addr += PGDIR_SIZE)

		pmd_clear(pmd_off_k(addr));



#ifdef CONFIG_XIP_KERNEL
@@ -766,7 +766,7 @@ static void __init devicemaps_init(struct machine_desc *mdesc) 
	 */

#ifdef CONFIG_XIP_KERNEL

	map.pfn = __phys_to_pfn(CONFIG_XIP_PHYS_ADDR & SECTION_MASK);

	map.virtual = MODULE_START;

	map.virtual = MODULES_VADDR;

	map.length = ((unsigned long)&_etext - map.virtual + ~SECTION_MASK) & SECTION_MASK;

	map.type = MT_ROM;

	create_mapping(&map);

mm/vmalloc.c

+1 −1
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static int vmap_page_range(unsigned long addr, unsigned long end, 
static inline int is_vmalloc_or_module_addr(const void *x)

{

	/*

	 * x86-64 and sparc64 put modules in a special place,

	 * ARM, x86-64 and sparc64 put modules in a special place,

	 * and fall back on vmalloc() if that fails. Others

	 * just put it in the vmalloc space.

	 */