x86, um: untangle uml ldt.h

[safe/jmp/linux-2.6] / arch / um / Makefile

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 94fb24e..909d16b 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -19,8 +19,8 @@ core-y                        += $(ARCH_DIR)/kernel/          \
                           $(ARCH_DIR)/os-$(OS)/
 
 # Have to precede the include because the included Makefiles reference them.
-SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
-       module.h vm-flags.h elf.h host_ldt.h
+SYMLINK_HEADERS := archparam.h system.h processor.h ptrace.h \
+       module.h vm-flags.h elf.h
 SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
 
 # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
@@ -66,6 +66,8 @@ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
 #This will adjust *FLAGS accordingly to the platform.
 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 
+KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include
+
 # -Derrno=kernel_errno - This turns all kernel references to errno into
 # kernel_errno to separate them from the libc errno.  This allows -fno-common
 # in KBUILD_CFLAGS.  Otherwise, it would cause ld to complain about the two different
@@ -156,9 +158,9 @@ $(ARCH_DIR)/include/asm/arch:
        @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
        $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
-       $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
+       $(Q)ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm $@
 else
-       $(Q)ln -fsn ../../../../include/asm-$(HEADER_ARCH) $@
+       $(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@
 endif
 
 $(objtree)/$(ARCH_DIR)/include/shared: