summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-18 05:05:42 +0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-23 09:55:20 +0400
commitbb8985586b7a906e116db835c64773b7a7d51663 (patch)
treede93ae58e88cc563d95cc124a73f3930594c6100 /arch/um
parent8ede0bdb63305d3353efd97e9af6210afb05734e (diff)
downloadlinux-bb8985586b7a906e116db835c64773b7a7d51663.tar.xz
x86, um: ... and asm-x86 move
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile4
-rw-r--r--arch/um/sys-x86_64/syscall_table.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 94fb24ea5afa..4fc79f3030e4 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -156,9 +156,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:
diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
index 32f5fbe2d0d2..ef42ec01eaff 100644
--- a/arch/um/sys-x86_64/syscall_table.c
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -42,7 +42,7 @@
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef ASM_X86__UNISTD_64_H
-#include <asm-x86/unistd_64.h>
+#include "../../x86/include/asm/unistd_64.h"
#undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym,
@@ -64,7 +64,7 @@ extern void sys_ni_syscall(void);
*/
sys_call_ptr_t sys_call_table[] __cacheline_aligned = {
-#include <asm-x86/unistd_64.h>
+#include "../../x86/include/asm/unistd_64.h"
};
int syscall_table_size = sizeof(sys_call_table);