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

sparc: simplify module_alloc() 



Define MODULES_VADDR and MODULES_END as VMALLOC_START and VMALLOC_END
for 32-bit and reduce module_alloc() to

	__vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END, ...)

as with the new defines the allocations becomes identical for both 32
and 64 bits.

While on it, drop unused include of <linux/jump_label.h>

Suggested-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarMike Rapoport (IBM) <rppt@kernel.org>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 38762155

arch/sparc/include/asm/pgtable_32.h

+2 −0
Original line number Diff line number Diff line
@@ -432,6 +432,8 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma, 


#define VMALLOC_START           _AC(0xfe600000,UL)

#define VMALLOC_END             _AC(0xffc00000,UL)

#define MODULES_VADDR           VMALLOC_START

#define MODULES_END             VMALLOC_END



/* We provide our own get_unmapped_area to cope with VA holes for userland */

#define HAVE_ARCH_UNMAPPED_AREA

arch/sparc/kernel/module.c

+1 −24
Original line number Diff line number Diff line
@@ -21,35 +21,12 @@ 


#include "entry.h"



#ifdef CONFIG_SPARC64



#include <linux/jump_label.h>



static void *module_map(unsigned long size)

void *module_alloc(unsigned long size)

{

	if (PAGE_ALIGN(size) > MODULES_LEN)

		return NULL;

	return __vmalloc_node_range(size, 1, MODULES_VADDR, MODULES_END,

				GFP_KERNEL, PAGE_KERNEL, 0, NUMA_NO_NODE,

				__builtin_return_address(0));

}

#else

static void *module_map(unsigned long size)

{

	return vmalloc(size);

}

#endif /* CONFIG_SPARC64 */



void *module_alloc(unsigned long size)

{

	void *ret;



	ret = module_map(size);

	if (ret)

		memset(ret, 0, size);



	return ret;

}



/* Make generic code ignore STT_REGISTER dummy undefined symbols.  */

int module_frob_arch_sections(Elf_Ehdr *hdr,