aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/um/Makefile18
-rw-r--r--arch/um/include/shared/common-offsets.h13
-rw-r--r--arch/um/include/shared/user.h2
3 files changed, 17 insertions, 16 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 425b81939619..d944c343acdb 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -18,10 +18,6 @@ core-y += $(ARCH_DIR)/kernel/ \
18 $(ARCH_DIR)/drivers/ \ 18 $(ARCH_DIR)/drivers/ \
19 $(ARCH_DIR)/os-$(OS)/ 19 $(ARCH_DIR)/os-$(OS)/
20 20
21# These are cleaned up during mrproper. Please DO NOT fix it again, this is
22# the Correct Thing(tm) to do!
23ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/uml-config.h
24
25MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas 21MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
26 22
27include $(srctree)/$(ARCH_DIR)/Makefile-skas 23include $(srctree)/$(ARCH_DIR)/Makefile-skas
@@ -29,7 +25,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
29ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared 25ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared
30ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared 26ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
31ifneq ($(KBUILD_SRC),) 27ifneq ($(KBUILD_SRC),)
32ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files 28ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for two generated files
33endif 29endif
34KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) 30KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)
35 31
@@ -89,7 +85,7 @@ endef
89 85
90KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) 86KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)
91 87
92archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h 88archprepare: $(ARCH_DIR)/include/shared/user_constants.h
93prepare: $(ARCH_DIR)/include/shared/kern_constants.h 89prepare: $(ARCH_DIR)/include/shared/kern_constants.h
94 90
95LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static 91LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
@@ -122,12 +118,10 @@ endef
122 118
123# When cleaning we don't include .config, so we don't include 119# When cleaning we don't include .config, so we don't include
124# TT or skas makefiles and don't clean skas_ptregs.h. 120# TT or skas makefiles and don't clean skas_ptregs.h.
125CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/shared/uml-config.h \ 121CLEAN_FILES += linux x.i gmon.out \
126 $(ARCH_DIR)/include/shared/user_constants.h \ 122 $(ARCH_DIR)/include/shared/user_constants.h \
127 $(ARCH_DIR)/include/shared/kern_constants.h 123 $(ARCH_DIR)/include/shared/kern_constants.h
128 124
129MRPROPER_FILES += $(ARCH_SYMLINKS)
130
131archclean: 125archclean:
132 @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ 126 @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
133 -o -name '*.gcov' \) -type f -print | xargs rm -f 127 -o -name '*.gcov' \) -type f -print | xargs rm -f
@@ -137,12 +131,6 @@ $(objtree)/$(ARCH_DIR)/include/shared:
137 $(Q)mkdir -p $@ 131 $(Q)mkdir -p $@
138 132
139# Generated files 133# Generated files
140define filechk_umlconfig
141 sed 's/ CONFIG/ UML_CONFIG/'
142endef
143
144$(ARCH_DIR)/include/shared/uml-config.h : include/linux/autoconf.h
145 $(call filechk,umlconfig)
146 134
147$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE 135$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE
148 $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@ 136 $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h
index b54bd35585c2..72009c7e3210 100644
--- a/arch/um/include/shared/common-offsets.h
+++ b/arch/um/include/shared/common-offsets.h
@@ -39,3 +39,16 @@ DEFINE(UM_HZ, HZ);
39DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC); 39DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC);
40DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); 40DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
41DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC); 41DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);
42
43#ifdef CONFIG_PRINTK
44DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);
45#endif
46#ifdef CONFIG_NO_HZ
47DEFINE(UML_CONFIG_NO_HZ, CONFIG_NO_HZ);
48#endif
49#ifdef CONFIG_UML_X86
50DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);
51#endif
52#ifdef CONFIG_64BIT
53DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);
54#endif
diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h
index 1723fac6f40d..293f7c794faa 100644
--- a/arch/um/include/shared/user.h
+++ b/arch/um/include/shared/user.h
@@ -6,7 +6,7 @@
6#ifndef __USER_H__ 6#ifndef __USER_H__
7#define __USER_H__ 7#define __USER_H__
8 8
9#include "uml-config.h" 9#include "kern_constants.h"
10 10
11/* 11/*
12 * The usual definition - copied here because the kernel provides its own, 12 * The usual definition - copied here because the kernel provides its own,