Skip to content

Commit

Permalink
kbuild: move asm-offsets.h to include/generated
Browse files Browse the repository at this point in the history 
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: Sam Ravnborg <[email protected]>
Cc: Al Viro <[email protected]>
Signed-off-by: Michal Marek <[email protected]>
  • Loading branch information
@sravnborg @michal42
sravnborg authored and michal42 committed Dec 12, 2009
1 parent 01fc0ac commit 559df2e
Show file tree
Hide file tree
Showing 24 changed files with 22 additions and 4 deletions.
1 change: 0 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Kbuild
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions arch/alpha/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/arm/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/avr32/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/blackfin/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/cris/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/frv/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/h8300/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/ia64/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/m68k/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/microblaze/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/mips/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/mn10300/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/parisc/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/powerpc/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/s390/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/sh/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/sparc/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
2 changes: 1 addition & 1 deletion arch/um/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions arch/um/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/x86/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>
1 change: 1 addition & 0 deletions arch/xtensa/include/asm/asm-offsets.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include <generated/asm-offsets.h>

0 comments on commit 559df2e

Please sign in to comment.