kbuild updates for 2.6.33
Hi Linus,
I'm resending the pull request because the previous one seems to have lost. I rebased the branch and added the two patches I sent as email previously, so that it merges ok and doesn't introduce new build failures (I just tested x86_64/allmodconfig). I also added one small fix from Mike Frisinger, otherwise it's the same stuff I sent before. The most interesting part is Sam's series that moves generated header files to include/generated, simplifying gitingnore rules and killing the include{,2}/asm symlink, the rest are small but worthwhile fixes and improvements.
Thanks!
Michal
The following changes since commit 053fe57ac249a9531c396175778160d9e9509399:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/net-2.6
are available in the git repository at:
git://repo.or.cz/linux-kbuild.git for-33
Daniel Vetter (1):
kbuild: specify absolute paths for cscope
Jan Beulich (1):
genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()
Jie Zhang (1):
net: add net_tstamp.h to headers_install
Jonathan Nieder (2):
scripts/package: add KBUILD_PKG_ROOTCMD variable scripts/package: deb-pkg: use fakeroot if available
Michael Tokarev (1):
kbuild: fix bzImage build for x86
Michal Marek (5):
scripts/package: tar-pkg: use tar --owner=root
kbuild: create include/generated in silentoldconfig
score: add asm/asm-offsets.h wrapper
kbuild: generate modules.builtin
kbuild: fix make clean after mismerge
Mike Frysinger (1):
gen_init_cpio: fixed fwrite warning
Sam Ravnborg (14):
kbuild: search arch/$ARCH/include before include/
dontdiff: add generated
kbuild: move bounds.h to include/generated
kbuild: move asm-offsets.h to include/generated
ia64: move nr-irqs.h to include/generated
arm: move mach-types to include/generated
sh: move machtypes.h to include/generated
kbuild: drop include2/ used for O=... builds
kbuild: do not check for include/asm-$ARCH
kbuild: drop include/asm
kbuild: move compile.h to include/generated drop explicit include of autoconf.h
kbuild: move autoconf.h to include/generated
kbuild: move utsrelease.h to include/generated
Stephen Rothwell (1):
net: fix for utsrelease.h moving to generated
Tony Finch (1):
unifdef: update to upstream revision 1.190
Wenji Huang (1):
Kbuild: clean up marker
.gitignore | 7 +- Documentation/dontdiff | 1 + Documentation/kbuild/kbuild.txt | 14 + Documentation/kbuild/kconfig.txt | 8 +- Kbuild | 4 +- MAINTAINERS | 6 + Makefile | 96 ++----- arch/alpha/boot/bootp.c | 2 +- arch/alpha/boot/bootpz.c | 2 +- arch/alpha/boot/main.c | 2 +- arch/alpha/include/asm/asm-offsets.h | 1 + arch/arm/Makefile | 14 +- arch/arm/include/asm/asm-offsets.h | 1 + arch/arm/include/asm/mach-types.h | 1 + arch/arm/tools/Makefile | 2 +- arch/arm/tools/gen-mach-types | 2 +- arch/avr32/include/asm/asm-offsets.h | 1 + arch/blackfin/include/asm/asm-offsets.h | 1 + arch/cris/arch-v32/kernel/head.S | 1 - arch/cris/include/asm/asm-offsets.h | 1 + arch/cris/kernel/asm-offsets.c | 1 - arch/cris/kernel/vmlinux.lds.S | 1 - arch/frv/include/asm/asm-offsets.h | 1 + arch/frv/kernel/setup.c | 2 +- arch/h8300/include/asm/asm-offsets.h | 1 + arch/ia64/Makefile | 2 +- arch/ia64/include/asm/asm-offsets.h | 1 + arch/ia64/include/asm/irq.h | 2 +- arch/ia64/kernel/Makefile | 7 +- arch/ia64/kvm/asm-offsets.c | 1 - arch/m68k/include/asm/asm-offsets.h | 1 + arch/m68k/kernel/head.S | 2 +- arch/microblaze/include/asm/asm-offsets.h | 1 + arch/mips/include/asm/asm-offsets.h | 1 + arch/mn10300/include/asm/asm-offsets.h | 1 + arch/parisc/include/asm/asm-offsets.h | 1 + arch/powerpc/include/asm/asm-offsets.h | 1 + arch/powerpc/platforms/52xx/efika.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/cell/spufs/Makefile | 6 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/s390/include/asm/asm-offsets.h | 1 + arch/score/include/asm/asm-offsets.h | 1 + arch/sh/Makefile | 10 +- arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- arch/sh/include/asm/.gitignore | 1 - arch/sh/include/asm/asm-offsets.h | 1 + arch/sh/include/asm/machvec.h | 2 +- arch/sh/tools/Makefile | 4 +- arch/sh/tools/gen-mach-types | 2 +- arch/sparc/include/asm/asm-offsets.h | 1 + arch/um/Makefile | 2 +- arch/um/include/asm/asm-offsets.h | 1 + arch/x86/boot/header.S | 2 +- arch/x86/boot/version.c | 4 +- arch/x86/include/asm/asm-offsets.h | 1 + arch/xtensa/include/asm/asm-offsets.h | 1 + drivers/accessibility/braille/braille_console.c | 1 - drivers/hid/hid-lg.h | 2 - drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- drivers/platform/x86/compal-laptop.c | 1 - drivers/staging/iio/ring_sw.h | 1 - drivers/staging/panel/panel.c | 2 +- include/linux/Kbuild | 1 + include/linux/mmdebug.h | 2 - include/linux/mmzone.h | 2 +- include/linux/page-flags.h | 2 +- include/linux/vermagic.h | 2 +- init/Makefile | 8 +- init/version.c | 4 +- kernel/bounds.c | 2 +- kernel/kexec.c | 2 +- kernel/trace/trace.c | 2 +- scripts/Kbuild.include | 6 + scripts/Makefile.lib | 2 +- scripts/Makefile.modbuiltin | 55 ++++ scripts/basic/fixdep.c | 10 +- scripts/genksyms/keywords.c_shipped | 191 +++++++------ scripts/genksyms/keywords.gperf | 2 + scripts/headers.sh | 2 - scripts/kconfig/Makefile | 1 + scripts/kconfig/confdata.c | 24 ++- scripts/mkcompile_h | 2 +- scripts/package/Makefile | 20 ++- scripts/package/buildtar | 6 +- scripts/tags.sh | 8 +- scripts/unifdef.c | 343 ++++++++++++++--------- usr/gen_init_cpio.c | 5 +- 89 files changed, 556 insertions(+), 401 deletions(-) create mode 100644 arch/alpha/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/mach-types.h create mode 100644 arch/avr32/include/asm/asm-offsets.h create mode 100644 arch/blackfin/include/asm/asm-offsets.h create mode 100644 arch/cris/include/asm/asm-offsets.h create mode 100644 arch/frv/include/asm/asm-offsets.h create mode 100644 arch/h8300/include/asm/asm-offsets.h create mode 100644 arch/ia64/include/asm/asm-offsets.h create mode 100644 arch/m68k/include/asm/asm-offsets.h create mode 100644 arch/microblaze/include/asm/asm-offsets.h create mode 100644 arch/mips/include/asm/asm-offsets.h create mode 100644 arch/mn10300/include/asm/asm-offsets.h create mode 100644 arch/parisc/include/asm/asm-offsets.h create mode 100644 arch/powerpc/include/asm/asm-offsets.h create mode 100644 arch/s390/include/asm/asm-offsets.h create mode 100644 arch/score/include/asm/asm-offsets.h delete mode 100644 arch/sh/include/asm/.gitignore create mode 100644 arch/sh/include/asm/asm-offsets.h create mode 100644 arch/sparc/include/asm/asm-offsets.h create mode 100644 arch/um/include/asm/asm-offsets.h create mode 100644 arch/x86/include/asm/asm-offsets.h create mode 100644 arch/xtensa/include/asm/asm-offsets.h create mode 100644 scripts/Makefile.modbuiltin
Quoted 9 lines · Michal Marek
git://repo.or.cz/linux-kbuild.gitfor-33.gitignore | 7 +- Documentation/dontdiff | 1 + Documentation/kbuild/kbuild.txt | 14 + Documentation/kbuild/kconfig.txt | 8 +-...
That's not at all the diffstat I get. I just get
Makefile | 5 +- include/linux/Kbuild | 1 + scripts/Makefile.lib | 2 +- scripts/mod/modpost.c | 164 ---------------------------------------------- scripts/mod/modpost.h | 3 - scripts/package/Makefile | 20 +++++- scripts/package/buildtar | 6 ++- 7 files changed, 28 insertions(+), 173 deletions(-)
Not pulled, since I suspect you meant me to pull something else.
Linus
Quoted 13 lines · Linus Torvalds
Quoted 9 lines · Michal Marek
git://repo.or.cz/linux-kbuild.gitfor-33.gitignore | 7 +- Documentation/dontdiff | 1 + Documentation/kbuild/kbuild.txt | 14 + Documentation/kbuild/kconfig.txt | 8 +-...
Quoted 3 lines
That's not at all the diffstat I get. I just get
Makefile | 5 +-
Oops, typo in git push, sorry. Now it should be there:
The following changes since commit 053fe57ac249a9531c396175778160d9e9509399:
Linus Torvalds (1):
Merge git://git.kernel.org/.../davem/net-2.6
are available in the git repository at:
git://repo.or.cz/linux-kbuild.git for-33
Daniel Vetter (1):
kbuild: specify absolute paths for cscope
Jan Beulich (1):
genksyms: properly consider EXPORT_UNUSED_SYMBOL{,_GPL}()
Jie Zhang (1):
net: add net_tstamp.h to headers_install
Jonathan Nieder (2):
scripts/package: add KBUILD_PKG_ROOTCMD variable scripts/package: deb-pkg: use fakeroot if available
Michael Tokarev (1):
kbuild: fix bzImage build for x86
Michal Marek (5):
scripts/package: tar-pkg: use tar --owner=root
kbuild: create include/generated in silentoldconfig
score: add asm/asm-offsets.h wrapper
kbuild: generate modules.builtin
kbuild: fix make clean after mismerge
Mike Frysinger (1):
gen_init_cpio: fixed fwrite warning
Sam Ravnborg (14):
kbuild: search arch/$ARCH/include before include/
dontdiff: add generated
kbuild: move bounds.h to include/generated
kbuild: move asm-offsets.h to include/generated
ia64: move nr-irqs.h to include/generated
arm: move mach-types to include/generated
sh: move machtypes.h to include/generated
kbuild: drop include2/ used for O=... builds
kbuild: do not check for include/asm-$ARCH
kbuild: drop include/asm
kbuild: move compile.h to include/generated drop explicit include of autoconf.h
kbuild: move autoconf.h to include/generated
kbuild: move utsrelease.h to include/generated
Stephen Rothwell (1):
net: fix for utsrelease.h moving to generated
Tony Finch (1):
unifdef: update to upstream revision 1.190
Wenji Huang (1):
Kbuild: clean up marker
.gitignore | 7 +- Documentation/dontdiff | 1 + Documentation/kbuild/kbuild.txt | 14 + Documentation/kbuild/kconfig.txt | 8 +- Kbuild | 4 +- MAINTAINERS | 6 + Makefile | 96 ++----- arch/alpha/boot/bootp.c | 2 +- arch/alpha/boot/bootpz.c | 2 +- arch/alpha/boot/main.c | 2 +- arch/alpha/include/asm/asm-offsets.h | 1 + arch/arm/Makefile | 14 +- arch/arm/include/asm/asm-offsets.h | 1 + arch/arm/include/asm/mach-types.h | 1 + arch/arm/tools/Makefile | 2 +- arch/arm/tools/gen-mach-types | 2 +- arch/avr32/include/asm/asm-offsets.h | 1 + arch/blackfin/include/asm/asm-offsets.h | 1 + arch/cris/arch-v32/kernel/head.S | 1 - arch/cris/include/asm/asm-offsets.h | 1 + arch/cris/kernel/asm-offsets.c | 1 - arch/cris/kernel/vmlinux.lds.S | 1 - arch/frv/include/asm/asm-offsets.h | 1 + arch/frv/kernel/setup.c | 2 +- arch/h8300/include/asm/asm-offsets.h | 1 + arch/ia64/Makefile | 2 +- arch/ia64/include/asm/asm-offsets.h | 1 + arch/ia64/include/asm/irq.h | 2 +- arch/ia64/kernel/Makefile | 7 +- arch/ia64/kvm/asm-offsets.c | 1 - arch/m68k/include/asm/asm-offsets.h | 1 + arch/m68k/kernel/head.S | 2 +- arch/microblaze/include/asm/asm-offsets.h | 1 + arch/mips/include/asm/asm-offsets.h | 1 + arch/mn10300/include/asm/asm-offsets.h | 1 + arch/parisc/include/asm/asm-offsets.h | 1 + arch/powerpc/include/asm/asm-offsets.h | 1 + arch/powerpc/platforms/52xx/efika.c | 2 +- arch/powerpc/platforms/amigaone/setup.c | 2 +- arch/powerpc/platforms/cell/spufs/Makefile | 6 +- arch/powerpc/platforms/chrp/setup.c | 2 +- arch/powerpc/platforms/powermac/bootx_init.c | 2 +- arch/s390/include/asm/asm-offsets.h | 1 + arch/score/include/asm/asm-offsets.h | 1 + arch/sh/Makefile | 10 +- arch/sh/drivers/pci/fixups-rts7751r2d.c | 2 +- arch/sh/include/asm/.gitignore | 1 - arch/sh/include/asm/asm-offsets.h | 1 + arch/sh/include/asm/machvec.h | 2 +- arch/sh/tools/Makefile | 4 +- arch/sh/tools/gen-mach-types | 2 +- arch/sparc/include/asm/asm-offsets.h | 1 + arch/um/Makefile | 2 +- arch/um/include/asm/asm-offsets.h | 1 + arch/x86/boot/header.S | 2 +- arch/x86/boot/version.c | 4 +- arch/x86/include/asm/asm-offsets.h | 1 + arch/xtensa/include/asm/asm-offsets.h | 1 + drivers/accessibility/braille/braille_console.c | 1 - drivers/hid/hid-lg.h | 2 - drivers/net/wireless/iwlwifi/iwl-core.h | 2 +- drivers/platform/x86/compal-laptop.c | 1 - drivers/staging/iio/ring_sw.h | 1 - drivers/staging/panel/panel.c | 2 +- include/linux/Kbuild | 1 + include/linux/mmdebug.h | 2 - include/linux/mmzone.h | 2 +- include/linux/page-flags.h | 2 +- include/linux/vermagic.h | 2 +- init/Makefile | 8 +- init/version.c | 4 +- kernel/bounds.c | 2 +- kernel/kexec.c | 2 +- kernel/trace/trace.c | 2 +- scripts/Kbuild.include | 6 + scripts/Makefile.lib | 2 +- scripts/Makefile.modbuiltin | 55 ++++ scripts/basic/fixdep.c | 10 +- scripts/genksyms/keywords.c_shipped | 191 +++++++------ scripts/genksyms/keywords.gperf | 2 + scripts/headers.sh | 2 - scripts/kconfig/Makefile | 1 + scripts/kconfig/confdata.c | 24 ++- scripts/mkcompile_h | 2 +- scripts/package/Makefile | 20 ++- scripts/package/buildtar | 6 +- scripts/tags.sh | 8 +- scripts/unifdef.c | 343 ++++++++++++++--------- usr/gen_init_cpio.c | 5 +- 89 files changed, 556 insertions(+), 401 deletions(-) create mode 100644 arch/alpha/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/asm-offsets.h create mode 100644 arch/arm/include/asm/mach-types.h create mode 100644 arch/avr32/include/asm/asm-offsets.h create mode 100644 arch/blackfin/include/asm/asm-offsets.h create mode 100644 arch/cris/include/asm/asm-offsets.h create mode 100644 arch/frv/include/asm/asm-offsets.h create mode 100644 arch/h8300/include/asm/asm-offsets.h create mode 100644 arch/ia64/include/asm/asm-offsets.h create mode 100644 arch/m68k/include/asm/asm-offsets.h create mode 100644 arch/microblaze/include/asm/asm-offsets.h create mode 100644 arch/mips/include/asm/asm-offsets.h create mode 100644 arch/mn10300/include/asm/asm-offsets.h create mode 100644 arch/parisc/include/asm/asm-offsets.h create mode 100644 arch/powerpc/include/asm/asm-offsets.h create mode 100644 arch/s390/include/asm/asm-offsets.h create mode 100644 arch/score/include/asm/asm-offsets.h delete mode 100644 arch/sh/include/asm/.gitignore create mode 100644 arch/sh/include/asm/asm-offsets.h create mode 100644 arch/sparc/include/asm/asm-offsets.h create mode 100644 arch/um/include/asm/asm-offsets.h create mode 100644 arch/x86/include/asm/asm-offsets.h create mode 100644 arch/xtensa/include/asm/asm-offsets.h create mode 100644 scripts/Makefile.modbuiltin
Michal