Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 87e299e5 authored by Al Viro's avatar Al Viro Committed by H. Peter Anvin
Browse files

x86, um: get rid of uml-config.h 



Take a few symbols we need into kern_constants.h

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 61bee204

arch/um/Makefile

+3 −15
Original line number Original line Diff line number Diff line
@@ -18,10 +18,6 @@ core-y += $(ARCH_DIR)/kernel/ \ 
			   $(ARCH_DIR)/drivers/		\

			   $(ARCH_DIR)/drivers/		\

			   $(ARCH_DIR)/os-$(OS)/

			   $(ARCH_DIR)/os-$(OS)/





# These are cleaned up during mrproper. Please DO NOT fix it again, this is

# the Correct Thing(tm) to do!

ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/uml-config.h



MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas

MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas





include $(srctree)/$(ARCH_DIR)/Makefile-skas

include $(srctree)/$(ARCH_DIR)/Makefile-skas
@@ -29,7 +25,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas 
ARCH_INCLUDE	:= -I$(srctree)/$(ARCH_DIR)/include/shared

ARCH_INCLUDE	:= -I$(srctree)/$(ARCH_DIR)/include/shared

ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared

ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared

ifneq ($(KBUILD_SRC),)

ifneq ($(KBUILD_SRC),)

ARCH_INCLUDE	+= -I$(ARCH_DIR)/include/shared # for three generated files

ARCH_INCLUDE	+= -I$(ARCH_DIR)/include/shared # for two generated files

endif

endif

KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)

KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)
@@ -89,7 +85,7 @@ endef 




KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)

KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)





archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h

archprepare: $(ARCH_DIR)/include/shared/user_constants.h

prepare: $(ARCH_DIR)/include/shared/kern_constants.h

prepare: $(ARCH_DIR)/include/shared/kern_constants.h





LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
@@ -122,12 +118,10 @@ endef 




# When cleaning we don't include .config, so we don't include

# When cleaning we don't include .config, so we don't include

# TT or skas makefiles and don't clean skas_ptregs.h.

# TT or skas makefiles and don't clean skas_ptregs.h.

CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/shared/uml-config.h \

CLEAN_FILES += linux x.i gmon.out \

	$(ARCH_DIR)/include/shared/user_constants.h \

	$(ARCH_DIR)/include/shared/user_constants.h \

	$(ARCH_DIR)/include/shared/kern_constants.h

	$(ARCH_DIR)/include/shared/kern_constants.h





MRPROPER_FILES += $(ARCH_SYMLINKS)



archclean:

archclean:

	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \

	@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \

		-o -name '*.gcov' \) -type f -print | xargs rm -f

		-o -name '*.gcov' \) -type f -print | xargs rm -f
@@ -137,12 +131,6 @@ $(objtree)/$(ARCH_DIR)/include/shared: 
	$(Q)mkdir -p $@

	$(Q)mkdir -p $@





# Generated files

# Generated files

define filechk_umlconfig

	sed 's/ CONFIG/ UML_CONFIG/'

endef



$(ARCH_DIR)/include/shared/uml-config.h : include/linux/autoconf.h

	$(call filechk,umlconfig)





$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE

$(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@

	$(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@

arch/um/include/shared/common-offsets.h

+13 −0
Original line number Original line Diff line number Diff line
@@ -39,3 +39,16 @@ DEFINE(UM_HZ, HZ); 
DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC);

DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC);

DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);

DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);

DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);

DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);



#ifdef CONFIG_PRINTK

DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);

#endif

#ifdef CONFIG_NO_HZ

DEFINE(UML_CONFIG_NO_HZ, CONFIG_NO_HZ);

#endif

#ifdef CONFIG_UML_X86

DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);

#endif

#ifdef CONFIG_64BIT

DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);

#endif

arch/um/include/shared/user.h

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

#ifndef __USER_H__

#define __USER_H__

#define __USER_H__





#include "uml-config.h"

#include "kern_constants.h"





/*

/*

 * The usual definition - copied here because the kernel provides its own,

 * The usual definition - copied here because the kernel provides its own,