leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

x86, um: get rid of uml asm/arch

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
Al Viro 2008-08-18 04:54:36 -04:00 committed by H. Peter Anvin
parent fe1cd9876f
commit 6b0eed4ef3
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/um/Makefile
View File

@ -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
# 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
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
ifneq ($(KBUILD_SRC),)
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
SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
@ -154,15 +154,6 @@ else
$(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
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:
@echo ' MKDIR $@'
$(Q)mkdir -p $@

7
arch/um/include/asm/string.h
View File

@ -1,7 +0,0 @@
#ifndef __UM_STRING_H
#define __UM_STRING_H
#include "asm/arch/string.h"
#include "asm/archparam.h"
#endif