Skip to content

Commit c0e5e10

Browse files
Amerigo Wangrustyrussell
authored andcommitted
uml module: fix uml build process due to this merge
Due to the previous merge, uml needs to be fixed. Signed-off-by: WANG Cong <[email protected]> Cc: Jeff Dike <[email protected]> Signed-off-by: Rusty Russell <[email protected]>
1 parent 0fdc83b commit c0e5e10

File tree

3 files changed

+2
-25
lines changed

3 files changed

+2
-25
lines changed

arch/um/sys-i386/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ obj-y = bug.o bugs.o checksum.o delay.o fault.o ksyms.o ldt.o ptrace.o \
88

99
subarch-obj-y = lib/semaphore_32.o lib/string_32.o
1010
subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
11-
subarch-obj-$(CONFIG_MODULES) += kernel/module_32.o
11+
subarch-obj-$(CONFIG_MODULES) += kernel/module.o
1212

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

arch/um/sys-x86_64/Makefile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,8 @@ obj-y = bug.o bugs.o delay.o fault.o ldt.o mem.o ptrace.o ptrace_user.o \
88
setjmp.o signal.o stub.o stub_segv.o syscalls.o syscall_table.o \
99
sysrq.o ksyms.o tls.o
1010

11-
obj-$(CONFIG_MODULES) += um_module.o
12-
1311
subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o
14-
subarch-obj-$(CONFIG_MODULES) += kernel/module_64.o
12+
subarch-obj-$(CONFIG_MODULES) += kernel/module.o
1513

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

arch/um/sys-x86_64/um_module.c

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)