Subject: uml module: fix uml build process due to this merge Date: Wed, 3 Jun 2009 21:46:28 -0400 From: Amerigo Wang Due to the previous merge, uml needs to be fixed. Signed-off-by: WANG Cong Cc: Jeff Dike Signed-off-by: Rusty Russell --- arch/um/sys-i386/Makefile | 2 +- arch/um/sys-x86_64/Makefile | 4 +--- arch/um/sys-x86_64/um_module.c | 21 --------------------- 3 files changed, 2 insertions(+), 25 deletions(-) Index: linux-2.6/arch/um/sys-i386/Makefile =================================================================== --- linux-2.6.orig/arch/um/sys-i386/Makefile +++ linux-2.6/arch/um/sys-i386/Makefile @@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.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 Index: linux-2.6/arch/um/sys-x86_64/Makefile =================================================================== --- linux-2.6.orig/arch/um/sys-x86_64/Makefile +++ linux-2.6/arch/um/sys-x86_64/Makefile @@ -8,10 +8,8 @@ obj-y = bug.o bugs.o delay.o fault.o ldt 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 Index: linux-2.6/arch/um/sys-x86_64/um_module.c =================================================================== --- linux-2.6.orig/arch/um/sys-x86_64/um_module.c +++ /dev/null @@ -1,21 +0,0 @@ -#include -#include - -/* 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. - */ -} -