Commit 6b0eed4e authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of uml asm/arch 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent fe1cd987

arch/um/Makefile

+2 −11
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$ 
#

#

# These are cleaned up during mrproper. Please DO NOT fix it again, this is

# These are cleaned up during mrproper. Please DO NOT fix it again, this is

# the Correct Thing(tm) to do!

# the Correct Thing(tm) to do!

ARCH_SYMLINKS = $(ARCH_DIR)/include/asm/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \

ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \

	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h

	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h





MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas

MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -38,7 +38,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas 
ARCH_INCLUDE	:= -I$(ARCH_DIR)/include/shared

ARCH_INCLUDE	:= -I$(ARCH_DIR)/include/shared

ifneq ($(KBUILD_SRC),)

ifneq ($(KBUILD_SRC),)

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

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

KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for arch symlink

KBUILD_CPPFLAGS	+= -I$(ARCH_DIR)/include # for SYMLINK_HEADERS

endif

endif

SYS_DIR		:= $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)

SYS_DIR		:= $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
@@ -154,15 +154,6 @@ else 
	$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@

	$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@

endif

endif





$(ARCH_DIR)/include/asm/arch:

	@echo '  SYMLINK $@'

ifneq ($(KBUILD_SRC),)

	$(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm

	$(Q)ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm $@

else

	$(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@

endif



$(objtree)/$(ARCH_DIR)/include/shared:

$(objtree)/$(ARCH_DIR)/include/shared:

	@echo '  MKDIR $@'

	@echo '  MKDIR $@'

	$(Q)mkdir -p $@

	$(Q)mkdir -p $@

arch/um/include/asm/string.h

deleted100644 → 0
+0 −7
Original line number Original line Diff line number Diff line 
#ifndef __UM_STRING_H

#define __UM_STRING_H



#include "asm/arch/string.h"

#include "asm/archparam.h"



#endif