lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

um: get rid of kern_constants.h

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
This commit is contained in:
Al Viro
2011-08-18 20:01:49 +01:00
committed by Richard Weinberger
parent 945581d5bd
commit 9e636452d0
5 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
arch/um/Makefile
View File

@@ -25,9 +25,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas
SHARED_HEADERS := $(ARCH_DIR)/include/shared SHARED_HEADERS := $(ARCH_DIR)/include/shared
ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS)
ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
ifneq ($(KBUILD_SRC),)
ARCH_INCLUDE += -I$(SHARED_HEADERS)
endif
KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)
# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so
@@ -87,7 +84,6 @@ endef
KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)
archprepare: include/generated/user_constants.h archprepare: include/generated/user_constants.h
archprepare: $(SHARED_HEADERS)/kern_constants.h
LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
@@ -118,8 +114,7 @@ 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 \ CLEAN_FILES += linux x.i gmon.out
$(SHARED_HEADERS)/kern_constants.h
archclean: archclean:
@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
@@ -146,8 +141,4 @@ endef
include/generated/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) $(call filechk,gen-asm-offsets)
$(SHARED_HEADERS)/kern_constants.h:
$(Q)mkdir -p $(dir $@)
$(Q)echo '#include <generated/asm-offsets.h>' >$@
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH

2
arch/um/include/shared/as-layout.h
View File

@@ -6,7 +6,7 @@
#ifndef __START_H__ #ifndef __START_H__
#define __START_H__ #define __START_H__
#include "kern_constants.h" #include <generated/asm-offsets.h>
/* /*
* Stolen from linux/const.h, which can't be directly included since * Stolen from linux/const.h, which can't be directly included since

2
arch/um/include/shared/task.h
View File

@@ -1,7 +1,7 @@
#ifndef __TASK_H #ifndef __TASK_H
#define __TASK_H #define __TASK_H
#include <kern_constants.h> #include <generated/asm-offsets.h>
#define TASK_REGS(task) ((struct uml_pt_regs *) &(((char *) (task))[HOST_TASK_REGS])) #define TASK_REGS(task) ((struct uml_pt_regs *) &(((char *) (task))[HOST_TASK_REGS]))
#define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID])) #define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID]))

2
arch/um/include/shared/um_malloc.h
View File

@@ -6,7 +6,7 @@
#ifndef __UM_MALLOC_H__ #ifndef __UM_MALLOC_H__
#define __UM_MALLOC_H__ #define __UM_MALLOC_H__
#include "kern_constants.h" #include <generated/asm-offsets.h>
extern void *uml_kmalloc(int size, int flags); extern void *uml_kmalloc(int size, int flags);
extern void kfree(const void *ptr); extern void kfree(const void *ptr);

2
arch/um/include/shared/user.h
View File

@@ -6,7 +6,7 @@
#ifndef __USER_H__ #ifndef __USER_H__
#define __USER_H__ #define __USER_H__
#include "kern_constants.h" #include <generated/asm-offsets.h>
/* /*
* The usual definition - copied here because the kernel provides its own, * The usual definition - copied here because the kernel provides its own,