Commit bb898558 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin

x86, um: ... and asm-x86 move

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 8ede0bdb
#include <asm-x86/unistd_32.h> #include "../../x86/include/asm/unistd_32.h"
unsigned ia32_dir_class[] = { unsigned ia32_dir_class[] = {
#include <asm-generic/audit_dir_write.h> #include <asm-generic/audit_dir_write.h>
......
...@@ -156,9 +156,9 @@ $(ARCH_DIR)/include/asm/arch: ...@@ -156,9 +156,9 @@ $(ARCH_DIR)/include/asm/arch:
@echo ' SYMLINK $@' @echo ' SYMLINK $@'
ifneq ($(KBUILD_SRC),) ifneq ($(KBUILD_SRC),)
$(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm $(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 else
$(Q)ln -fsn ../../../../include/asm-$(HEADER_ARCH) $@ $(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@
endif endif
$(objtree)/$(ARCH_DIR)/include/shared: $(objtree)/$(ARCH_DIR)/include/shared:
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ; #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef ASM_X86__UNISTD_64_H #undef ASM_X86__UNISTD_64_H
#include <asm-x86/unistd_64.h> #include "../../x86/include/asm/unistd_64.h"
#undef __SYSCALL #undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym, #define __SYSCALL(nr, sym) [ nr ] = sym,
...@@ -64,7 +64,7 @@ extern void sys_ni_syscall(void); ...@@ -64,7 +64,7 @@ extern void sys_ni_syscall(void);
*/ */
sys_call_ptr_t sys_call_table[] __cacheline_aligned = { 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); int syscall_table_size = sizeof(sys_call_table);
...@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) ...@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
mcore-y := arch/x86/mach-default/ mcore-y := arch/x86/mach-default/
# Voyager subarch support # Voyager subarch support
mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager mflags-$(CONFIG_X86_VOYAGER) := -Iarch/x86/include/asm/mach-voyager
mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager/ mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager/
# generic subarchitecture # generic subarchitecture
mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/asm/mach-generic
fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/ mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/
# default subarch .h files # default subarch .h files
mflags-y += -Iinclude/asm-x86/mach-default mflags-y += -Iarch/x86/include/asm/mach-default
# 64 bit does not support subarch support - clear sub arch variables # 64 bit does not support subarch support - clear sub arch variables
fcore-$(CONFIG_X86_64) := fcore-$(CONFIG_X86_64) :=
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment