From ac7f3e1618787f4444e4dffa07ead0fd09efb549 Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Sun, 19 Apr 2009 22:35:10 +0200 Subject: [PATCH] --- yaml --- r: 177686 b: refs/heads/master c: 559df2e0210352f83926d178c40c51142292a18c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/.gitignore | 1 - trunk/Kbuild | 2 +- trunk/Makefile | 1 - trunk/arch/alpha/include/asm/asm-offsets.h | 1 + trunk/arch/arm/include/asm/asm-offsets.h | 1 + trunk/arch/avr32/include/asm/asm-offsets.h | 1 + trunk/arch/blackfin/include/asm/asm-offsets.h | 1 + trunk/arch/cris/include/asm/asm-offsets.h | 1 + trunk/arch/frv/include/asm/asm-offsets.h | 1 + trunk/arch/h8300/include/asm/asm-offsets.h | 1 + trunk/arch/ia64/include/asm/asm-offsets.h | 1 + trunk/arch/m68k/include/asm/asm-offsets.h | 1 + trunk/arch/microblaze/include/asm/asm-offsets.h | 1 + trunk/arch/mips/include/asm/asm-offsets.h | 1 + trunk/arch/mn10300/include/asm/asm-offsets.h | 1 + trunk/arch/parisc/include/asm/asm-offsets.h | 1 + trunk/arch/powerpc/include/asm/asm-offsets.h | 1 + trunk/arch/s390/include/asm/asm-offsets.h | 1 + trunk/arch/sh/include/asm/asm-offsets.h | 1 + trunk/arch/sparc/include/asm/asm-offsets.h | 1 + trunk/arch/um/Makefile | 2 +- trunk/arch/um/include/asm/asm-offsets.h | 1 + trunk/arch/x86/include/asm/asm-offsets.h | 1 + trunk/arch/xtensa/include/asm/asm-offsets.h | 1 + 25 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 trunk/arch/alpha/include/asm/asm-offsets.h create mode 100644 trunk/arch/arm/include/asm/asm-offsets.h create mode 100644 trunk/arch/avr32/include/asm/asm-offsets.h create mode 100644 trunk/arch/blackfin/include/asm/asm-offsets.h create mode 100644 trunk/arch/cris/include/asm/asm-offsets.h create mode 100644 trunk/arch/frv/include/asm/asm-offsets.h create mode 100644 trunk/arch/h8300/include/asm/asm-offsets.h create mode 100644 trunk/arch/ia64/include/asm/asm-offsets.h create mode 100644 trunk/arch/m68k/include/asm/asm-offsets.h create mode 100644 trunk/arch/microblaze/include/asm/asm-offsets.h create mode 100644 trunk/arch/mips/include/asm/asm-offsets.h create mode 100644 trunk/arch/mn10300/include/asm/asm-offsets.h create mode 100644 trunk/arch/parisc/include/asm/asm-offsets.h create mode 100644 trunk/arch/powerpc/include/asm/asm-offsets.h create mode 100644 trunk/arch/s390/include/asm/asm-offsets.h create mode 100644 trunk/arch/sh/include/asm/asm-offsets.h create mode 100644 trunk/arch/sparc/include/asm/asm-offsets.h create mode 100644 trunk/arch/um/include/asm/asm-offsets.h create mode 100644 trunk/arch/x86/include/asm/asm-offsets.h create mode 100644 trunk/arch/xtensa/include/asm/asm-offsets.h diff --git a/[refs] b/[refs] index d11137d1cf8b..be969aba968c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 01fc0ac198eabcbf460e1ed058860a935b6c2c9a +refs/heads/master: 559df2e0210352f83926d178c40c51142292a18c diff --git a/trunk/.gitignore b/trunk/.gitignore index 36d9cd6d4281..3582f422813b 100644 --- a/trunk/.gitignore +++ b/trunk/.gitignore @@ -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 diff --git a/trunk/Kbuild b/trunk/Kbuild index 1165d7a5ca4a..e3737ad72b5a 100644 --- a/trunk/Kbuild +++ b/trunk/Kbuild @@ -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) diff --git a/trunk/Makefile b/trunk/Makefile index b58e9312ce30..eb43b9fa30b5 100644 --- a/trunk/Makefile +++ b/trunk/Makefile @@ -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 diff --git a/trunk/arch/alpha/include/asm/asm-offsets.h b/trunk/arch/alpha/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/alpha/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/arm/include/asm/asm-offsets.h b/trunk/arch/arm/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/arm/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/avr32/include/asm/asm-offsets.h b/trunk/arch/avr32/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/avr32/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/blackfin/include/asm/asm-offsets.h b/trunk/arch/blackfin/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/blackfin/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/cris/include/asm/asm-offsets.h b/trunk/arch/cris/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/cris/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/frv/include/asm/asm-offsets.h b/trunk/arch/frv/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/frv/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/h8300/include/asm/asm-offsets.h b/trunk/arch/h8300/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/h8300/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/ia64/include/asm/asm-offsets.h b/trunk/arch/ia64/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/ia64/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/m68k/include/asm/asm-offsets.h b/trunk/arch/m68k/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/m68k/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/microblaze/include/asm/asm-offsets.h b/trunk/arch/microblaze/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/microblaze/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/mips/include/asm/asm-offsets.h b/trunk/arch/mips/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/mips/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/mn10300/include/asm/asm-offsets.h b/trunk/arch/mn10300/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/mn10300/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/parisc/include/asm/asm-offsets.h b/trunk/arch/parisc/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/parisc/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/powerpc/include/asm/asm-offsets.h b/trunk/arch/powerpc/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/powerpc/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/s390/include/asm/asm-offsets.h b/trunk/arch/s390/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/s390/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/sh/include/asm/asm-offsets.h b/trunk/arch/sh/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/sh/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/sparc/include/asm/asm-offsets.h b/trunk/arch/sparc/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/sparc/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/um/Makefile b/trunk/arch/um/Makefile index fc633dbacf84..fab8121d2b32 100644 --- a/trunk/arch/um/Makefile +++ b/trunk/arch/um/Makefile @@ -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 diff --git a/trunk/arch/um/include/asm/asm-offsets.h b/trunk/arch/um/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/um/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/x86/include/asm/asm-offsets.h b/trunk/arch/x86/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/x86/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include diff --git a/trunk/arch/xtensa/include/asm/asm-offsets.h b/trunk/arch/xtensa/include/asm/asm-offsets.h new file mode 100644 index 000000000000..d370ee36a182 --- /dev/null +++ b/trunk/arch/xtensa/include/asm/asm-offsets.h @@ -0,0 +1 @@ +#include