Commit 559df2e0 authored by Sam Ravnborg's avatar Sam Ravnborg Committed by Michal Marek

kbuild: move asm-offsets.h to include/generated

The simplest method was to add an extra asm-offsets.h
file in arch/$ARCH/include/asm that references the generated file.

We can now migrate the architectures one-by-one to reference
the generated file direct - and when done we can delete the
temporary arch/$ARCH/include/asm/asm-offsets.h file.
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 01fc0ac1
......@@ -46,7 +46,6 @@ Module.symvers
# Generated include files
#
include/asm
include/asm-*/asm-offsets.h
include/config
include/linux/autoconf.h
include/linux/compile.h
......
......@@ -43,7 +43,7 @@ $(obj)/$(bounds-file): kernel/bounds.s Kbuild
# 2) Generate asm-offsets.h
#
offsets-file := include/asm/asm-offsets.h
offsets-file := include/generated/asm-offsets.h
always += $(offsets-file)
targets += $(offsets-file)
......
......@@ -1197,7 +1197,6 @@ MRPROPER_DIRS += include/config include2 usr/include include/generated
MRPROPER_FILES += .config .config.old include/asm .version .old_version \
include/linux/autoconf.h include/linux/version.h \
include/linux/utsrelease.h \
include/asm*/asm-offsets.h \
Module.symvers Module.markers tags TAGS cscope*
# clean - Delete most, but leave enough to build external modules
......
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
......@@ -149,6 +149,6 @@ $(SHARED_HEADERS)/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
$(SHARED_HEADERS)/kern_constants.h:
$(Q)mkdir -p $(dir $@)
$(Q)echo '#include "../../../../include/asm/asm-offsets.h"' >$@
$(Q)echo '#include "../../../../include/generated/asm-offsets.h"' >$@
export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
#include <generated/asm-offsets.h>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment