Commit 858ba944 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: merge arch/um/sys-{i386,x86_64}/shared 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 27f85f12

arch/um/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH) 


SHARED_HEADERS	:= $(ARCH_DIR)/include/shared

ARCH_INCLUDE	:= -I$(srctree)/$(SHARED_HEADERS)

ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared

ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)/shared

KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)

KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)



# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so

# named - it's a common symbol in libpcap, so we get a binary which crashes.

arch/um/sys-x86/shared/sysdep/archsetjmp.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#ifdef __i386__

#include "archsetjmp_32.h"

#else

#include "archsetjmp_64.h"

#endif

arch/um/sys-x86/shared/sysdep/barrier.h

0 → 100644
+5 −0
Original line number Diff line number Diff line 
#ifdef __i386__

#include "barrier_32.h"

#else

#include "barrier_64.h"

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE