2005-09-01 22:54:54

by Jeff Dike

[permalink] [raw]
Subject: [PATCH 2/12] UML - x86_64 build fix

semaphore.c is no longer available from arch/x86_64, so we just pick up the
generic version instead.

Signed-off-by: Jeff Dike <[email protected]>

Index: linux-2.6.13-mm1/arch/um/sys-x86_64/Makefile
===================================================================
--- linux-2.6.13-mm1.orig/arch/um/sys-x86_64/Makefile 2005-09-01 15:52:25.000000000 -0400
+++ linux-2.6.13-mm1/arch/um/sys-x86_64/Makefile 2005-09-01 15:53:04.000000000 -0400
@@ -6,7 +6,7 @@

#XXX: why into lib-y?
lib-y = bitops.o bugs.o csum-partial.o delay.o fault.o mem.o memcpy.o \
- ptrace.o ptrace_user.o semaphore.o sigcontext.o signal.o stub.o \
+ ptrace.o ptrace_user.o sigcontext.o signal.o stub.o \
stub_segv.o syscalls.o syscall_table.o sysrq.o thunk.o

obj-y := ksyms.o
@@ -15,7 +15,7 @@
USER_OBJS := ptrace_user.o sigcontext.o

SYMLINKS = bitops.c csum-copy.S csum-partial.c csum-wrappers.c memcpy.S \
- semaphore.c thunk.S module.c
+ thunk.S module.c

include arch/um/scripts/Makefile.rules

@@ -24,7 +24,6 @@
csum-partial.c-dir = lib
csum-wrappers.c-dir = lib
memcpy.S-dir = lib
-semaphore.c-dir = kernel
thunk.S-dir = lib
module.c-dir = kernel