From 4de1c5f65c7dd4965a2a58b93205b747d7826110 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:01:19 +0100 Subject: [PATCH] um: take user_constants.h to include/generated Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- arch/um/Makefile | 5 ++--- arch/um/sys-i386/shared/sysdep/ptrace.h | 2 +- arch/um/sys-i386/shared/sysdep/ptrace_user.h | 2 +- arch/um/sys-i386/shared/sysdep/sc.h | 2 +- arch/um/sys-x86_64/shared/sysdep/ptrace.h | 2 +- arch/um/sys-x86_64/shared/sysdep/ptrace_user.h | 2 +- arch/um/sys-x86_64/shared/sysdep/sc.h | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/um/Makefile b/arch/um/Makefile index deb05533f872..3aded4e04f87 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -86,7 +86,7 @@ endef KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) -archprepare: $(SHARED_HEADERS)/user_constants.h +archprepare: include/generated/user_constants.h archprepare: $(SHARED_HEADERS)/kern_constants.h LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static @@ -119,7 +119,6 @@ endef # When cleaning we don't include .config, so we don't include # TT or skas makefiles and don't clean skas_ptregs.h. CLEAN_FILES += linux x.i gmon.out \ - $(SHARED_HEADERS)/user_constants.h \ $(SHARED_HEADERS)/kern_constants.h archclean: @@ -144,7 +143,7 @@ define filechk_gen-asm-offsets echo ""; ) endef -$(SHARED_HEADERS)/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s +include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s $(call filechk,gen-asm-offsets) $(SHARED_HEADERS)/kern_constants.h: diff --git a/arch/um/sys-i386/shared/sysdep/ptrace.h b/arch/um/sys-i386/shared/sysdep/ptrace.h index c4142315f22b..36006994148e 100644 --- a/arch/um/sys-i386/shared/sysdep/ptrace.h +++ b/arch/um/sys-i386/shared/sysdep/ptrace.h @@ -6,7 +6,7 @@ #ifndef __SYSDEP_I386_PTRACE_H #define __SYSDEP_I386_PTRACE_H -#include "user_constants.h" +#include #include "sysdep/faultinfo.h" #define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long)) diff --git a/arch/um/sys-i386/shared/sysdep/ptrace_user.h b/arch/um/sys-i386/shared/sysdep/ptrace_user.h index ef56247e4143..e4398a38a8a6 100644 --- a/arch/um/sys-i386/shared/sysdep/ptrace_user.h +++ b/arch/um/sys-i386/shared/sysdep/ptrace_user.h @@ -9,7 +9,7 @@ #include #include #include -#include "user_constants.h" +#include #define PT_OFFSET(r) ((r) * sizeof(long)) diff --git a/arch/um/sys-i386/shared/sysdep/sc.h b/arch/um/sys-i386/shared/sysdep/sc.h index c57d1780ad37..7b892407157a 100644 --- a/arch/um/sys-i386/shared/sysdep/sc.h +++ b/arch/um/sys-i386/shared/sysdep/sc.h @@ -1,7 +1,7 @@ #ifndef __SYSDEP_I386_SC_H #define __SYSDEP_I386_SC_H -#include +#include #define SC_OFFSET(sc, field) \ *((unsigned long *) &(((char *) (sc))[HOST_##field])) diff --git a/arch/um/sys-x86_64/shared/sysdep/ptrace.h b/arch/um/sys-x86_64/shared/sysdep/ptrace.h index 1a199606009b..ea5d7c1783cb 100644 --- a/arch/um/sys-x86_64/shared/sysdep/ptrace.h +++ b/arch/um/sys-x86_64/shared/sysdep/ptrace.h @@ -8,7 +8,7 @@ #ifndef __SYSDEP_X86_64_PTRACE_H #define __SYSDEP_X86_64_PTRACE_H -#include "user_constants.h" +#include #include "sysdep/faultinfo.h" #define MAX_REG_OFFSET (UM_FRAME_SIZE) diff --git a/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h index 4dbccdb58f48..faf9cddacd9a 100644 --- a/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h +++ b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h @@ -12,7 +12,7 @@ #include #include #undef __FRAME_OFFSETS -#include "user_constants.h" +#include #define PT_INDEX(off) ((off) / sizeof(unsigned long)) diff --git a/arch/um/sys-x86_64/shared/sysdep/sc.h b/arch/um/sys-x86_64/shared/sysdep/sc.h index 8aee45b07434..20313a2590e8 100644 --- a/arch/um/sys-x86_64/shared/sysdep/sc.h +++ b/arch/um/sys-x86_64/shared/sysdep/sc.h @@ -5,7 +5,7 @@ * Released under the GPL */ -#include +#include #define SC_OFFSET(sc, field) \ *((unsigned long *) &(((char *) (sc))[HOST_##field]))