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

Commit c0e5e10b authored by Amerigo Wang's avatar Amerigo Wang Committed by Rusty Russell
Browse files

uml module: fix uml build process due to this merge 



Due to the previous merge, uml needs to be fixed.

Signed-off-by: default avatarWANG Cong <amwang@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 0fdc83b9

arch/um/sys-i386/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \ 


subarch-obj-y = lib/semaphore_32.o lib/string_32.o

subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o

subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o

subarch-obj-$(CONFIG_MODULES) += kernel/module.o



USER_OBJS := bugs.o ptrace_user.o fault.o

arch/um/sys-x86_64/Makefile

+1 −3
Original line number Diff line number Diff line
@@ -8,10 +8,8 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \ 
	setjmp.o signal.o stub.o stub_segv.o syscalls.o syscall_table.o \

	sysrq.o ksyms.o tls.o



obj-$(CONFIG_MODULES) += um_module.o



subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o

subarch-obj-$(CONFIG_MODULES) += kernel/module_64.o

subarch-obj-$(CONFIG_MODULES) += kernel/module.o



ldt-y = ../sys-i386/ldt.o

arch/um/sys-x86_64/um_module.c

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#include <linux/vmalloc.h>

#include <linux/moduleloader.h>



/* Copied from i386 arch/i386/kernel/module.c */

void *module_alloc(unsigned long size)

{

	if (size == 0)

		return NULL;

	return vmalloc_exec(size);

}



/* Free memory returned from module_alloc */

void module_free(struct module *mod, void *module_region)

{

	vfree(module_region);

	/*

	 * FIXME: If module_region == mod->init_region, trim exception

	 * table entries.

	 */

}