Commit 4de1c5f6 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: take user_constants.h to include/generated 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 9f270de8

arch/um/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -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:

arch/um/sys-i386/shared/sysdep/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __SYSDEP_I386_PTRACE_H

#define __SYSDEP_I386_PTRACE_H



#include "user_constants.h"

#include <generated/user_constants.h>

#include "sysdep/faultinfo.h"



#define MAX_REG_NR (UM_FRAME_SIZE / sizeof(unsigned long))

arch/um/sys-i386/shared/sysdep/ptrace_user.h

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <sys/ptrace.h>

#include <linux/ptrace.h>

#include <asm/ptrace.h>

#include "user_constants.h"

#include <generated/user_constants.h>



#define PT_OFFSET(r) ((r) * sizeof(long))

arch/um/sys-i386/shared/sysdep/sc.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __SYSDEP_I386_SC_H

#define __SYSDEP_I386_SC_H



#include <user_constants.h>

#include <generated/user_constants.h>



#define SC_OFFSET(sc, field) \

	*((unsigned long *) &(((char *) (sc))[HOST_##field]))

arch/um/sys-x86_64/shared/sysdep/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
#ifndef __SYSDEP_X86_64_PTRACE_H

#define __SYSDEP_X86_64_PTRACE_H



#include "user_constants.h"

#include <generated/user_constants.h>

#include "sysdep/faultinfo.h"



#define MAX_REG_OFFSET (UM_FRAME_SIZE)