Commit 9e636452 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: get rid of kern_constants.h 



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

arch/um/Makefile

+1 −10
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas 
SHARED_HEADERS	:= $(ARCH_DIR)/include/shared

ARCH_INCLUDE	:= -I$(srctree)/$(SHARED_HEADERS)

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)



# -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so
@@ -87,7 +84,6 @@ endef 
KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)



archprepare: include/generated/user_constants.h

archprepare: $(SHARED_HEADERS)/kern_constants.h



LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static

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

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

CLEAN_FILES += linux x.i gmon.out \

	$(SHARED_HEADERS)/kern_constants.h

CLEAN_FILES += linux x.i gmon.out



archclean:

	@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

	$(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

arch/um/include/shared/as-layout.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __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

arch/um/include/shared/task.h

+1 −1
Original line number Diff line number Diff line 
#ifndef __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_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID]))

arch/um/include/shared/um_malloc.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __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 kfree(const void *ptr);

arch/um/include/shared/user.h

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#ifndef __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,