* [GIT PULL] kbuild updates for 2.6.33
@ 2009-12-08 13:30 Michal Marek
2009-12-08 15:14 ` Michal Marek
2009-12-09 9:33 ` Michal Marek
0 siblings, 2 replies; 6+ messages in thread
From: Michal Marek @ 2009-12-08 13:30 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kbuild, linux-kernel
Hi Linus,
these are the kbuild patches I collected for 2.6.33. There might be a few
more later, but this is the main part.
Thanks,
Michal
The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d:
Linus Torvalds (1):
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
are available in the git repository at:
git://repo.or.cz/linux-kbuild.git for-next
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 (4):
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
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
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/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 ++++++++++++++---------
87 files changed, 551 insertions(+), 399 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
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] kbuild updates for 2.6.33
2009-12-08 13:30 [GIT PULL] kbuild updates for 2.6.33 Michal Marek
@ 2009-12-08 15:14 ` Michal Marek
2009-12-09 9:33 ` Michal Marek
1 sibling, 0 replies; 6+ messages in thread
From: Michal Marek @ 2009-12-08 15:14 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kbuild, linux-kernel
On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote:
> Hi Linus,
>
> these are the kbuild patches I collected for 2.6.33. There might be a few
> more later, but this is the main part.
>
> Thanks,
> Michal
>
> The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d:
> Linus Torvalds (1):
> Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
>
> are available in the git repository at:
>
> git://repo.or.cz/linux-kbuild.git for-next
>
...
> Michal Marek (4):
> kbuild: generate modules.builtin
This patch broke make clean unfortunatelly. The for-next branch already
has a fix (commit e1cf87b), please, if you already fetched the branch,
fetch again. I'm attaching the fix for reference.
Michal
---
From: Michal Marek <mmarek@suse.cz>
Subject: [PATCH] kbuild: fix make clean after mismerge
Fix typo / thinko in commit 698699f.
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
Makefile | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/Makefile b/Makefile
index 391fcb3..8491b21 100644
--- a/Makefile
+++ b/Makefile
@@ -1174,7 +1174,7 @@ clean: archclean $(clean-dirs)
\( -name '*.[oas]' -o -name '*.ko' -o -name '.*.cmd' \
-o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
-o -name '*.symtypes' -o -name 'modules.order' \
- -o modules.order -o -name '.tmp_*.o.*' \
+ -o -name modules.builtin -o -name '.tmp_*.o.*' \
-o -name '*.gcno' \) -type f -print | xargs rm -f
# mrproper - Delete all generated files, including .config
--
1.6.5.3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT PULL] kbuild updates for 2.6.33
2009-12-08 13:30 [GIT PULL] kbuild updates for 2.6.33 Michal Marek
2009-12-08 15:14 ` Michal Marek
@ 2009-12-09 9:33 ` Michal Marek
2009-12-09 17:31 ` Randy Dunlap
1 sibling, 1 reply; 6+ messages in thread
From: Michal Marek @ 2009-12-09 9:33 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-kbuild, linux-kernel, Stephen Rothwell
On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote:
> Hi Linus,
>
> these are the kbuild patches I collected for 2.6.33. There might be a few
> more later, but this is the main part.
>
> Thanks,
> Michal
>
> The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d:
> Linus Torvalds (1):
> Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
>
> are available in the git repository at:
>
> git://repo.or.cz/linux-kbuild.git for-next
Hi Linus,
The kbuild tree now breaks with 250cce26 ("iwlwifi: driver version
track kernel version") which you merged yesterday. Stephen Rothwell
kindly provided a fix, which I would normally apply to the kbuild tree,
but I don't want to rebase it as I already sent the pull request. Could
you please apply the following one-liner when merging the kbuild tree?
Thanks!
Michal
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 7 Dec 2009 19:56:42 +1100
Subject: [PATCH] net: fix for utsrelease.h moving to generated
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Michal Marek <mmarek@suse.cz>
---
drivers/net/wireless/iwlwifi/iwl-core.h | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
index 675b7df..27ca859 100644
--- a/drivers/net/wireless/iwlwifi/iwl-core.h
+++ b/drivers/net/wireless/iwlwifi/iwl-core.h
@@ -63,7 +63,7 @@
#ifndef __iwl_core_h__
#define __iwl_core_h__
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
/************************
* forward declarations *
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [GIT PULL] kbuild updates for 2.6.33
2009-12-09 9:33 ` Michal Marek
@ 2009-12-09 17:31 ` Randy Dunlap
2009-12-09 19:20 ` Sam Ravnborg
0 siblings, 1 reply; 6+ messages in thread
From: Randy Dunlap @ 2009-12-09 17:31 UTC (permalink / raw)
To: Michal Marek; +Cc: Linus Torvalds, linux-kbuild, linux-kernel, Stephen Rothwell
On Wed, 9 Dec 2009 10:33:49 +0100 Michal Marek wrote:
> On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote:
> > Hi Linus,
> >
> > these are the kbuild patches I collected for 2.6.33. There might be a few
> > more later, but this is the main part.
> >
> > Thanks,
> > Michal
> >
> > The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d:
> > Linus Torvalds (1):
> > Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
> >
> > are available in the git repository at:
> >
> > git://repo.or.cz/linux-kbuild.git for-next
>
> Hi Linus,
>
> The kbuild tree now breaks with 250cce26 ("iwlwifi: driver version
> track kernel version") which you merged yesterday. Stephen Rothwell
> kindly provided a fix, which I would normally apply to the kbuild tree,
> but I don't want to rebase it as I already sent the pull request. Could
> you please apply the following one-liner when merging the kbuild tree?
> Thanks!
Hi > Michal,
Is there anything that tells us when we should/must use
<generated/*.h> ?
Thanks.
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 7 Dec 2009 19:56:42 +1100
> Subject: [PATCH] net: fix for utsrelease.h moving to generated
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> Signed-off-by: Michal Marek <mmarek@suse.cz>
> ---
> drivers/net/wireless/iwlwifi/iwl-core.h | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/net/wireless/iwlwifi/iwl-core.h b/drivers/net/wireless/iwlwifi/iwl-core.h
> index 675b7df..27ca859 100644
> --- a/drivers/net/wireless/iwlwifi/iwl-core.h
> +++ b/drivers/net/wireless/iwlwifi/iwl-core.h
> @@ -63,7 +63,7 @@
> #ifndef __iwl_core_h__
> #define __iwl_core_h__
>
> -#include <linux/utsrelease.h>
> +#include <generated/utsrelease.h>
>
> /************************
> * forward declarations *
> --
---
~Randy
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] kbuild updates for 2.6.33
2009-12-09 17:31 ` Randy Dunlap
@ 2009-12-09 19:20 ` Sam Ravnborg
2009-12-10 14:12 ` Michal Marek
0 siblings, 1 reply; 6+ messages in thread
From: Sam Ravnborg @ 2009-12-09 19:20 UTC (permalink / raw)
To: Randy Dunlap
Cc: Michal Marek, Linus Torvalds, linux-kbuild, linux-kernel,
Stephen Rothwell
On Wed, Dec 09, 2009 at 09:31:08AM -0800, Randy Dunlap wrote:
> On Wed, 9 Dec 2009 10:33:49 +0100 Michal Marek wrote:
>
> > On Tue, Dec 08, 2009 at 02:30:04PM +0100, Michal Marek wrote:
> > > Hi Linus,
> > >
> > > these are the kbuild patches I collected for 2.6.33. There might be a few
> > > more later, but this is the main part.
> > >
> > > Thanks,
> > > Michal
> > >
> > > The following changes since commit 6ec22f9b037fc0c2e00ddb7023fad279c365324d:
> > > Linus Torvalds (1):
> > > Merge branch 'x86-debug-for-linus' of git://git.kernel.org/.../tip/linux-2.6-tip
> > >
> > > are available in the git repository at:
> > >
> > > git://repo.or.cz/linux-kbuild.git for-next
> >
> > Hi Linus,
> >
> > The kbuild tree now breaks with 250cce26 ("iwlwifi: driver version
> > track kernel version") which you merged yesterday. Stephen Rothwell
> > kindly provided a fix, which I would normally apply to the kbuild tree,
> > but I don't want to rebase it as I already sent the pull request. Could
> > you please apply the following one-liner when merging the kbuild tree?
> > Thanks!
>
> Hi > Michal,
>
> Is there anything that tells us when we should/must use
> <generated/*.h> ?
The original idea was that include/generated/ should
be used for all generated header files.
I once had a patch applied that used it for other
generated files - this was a bad idea. Said patch
was reverted as it had much bigger issues.
So think of it as a place for generated header files only.
This also warrants the location in include/
But only for 'global' header files. For drivers
and the like that needs the header file only locally the
header file should not be located n include/generated,
as it is only for the global headers.
asm-offsets.h is a good example here.
Sam
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [GIT PULL] kbuild updates for 2.6.33
2009-12-09 19:20 ` Sam Ravnborg
@ 2009-12-10 14:12 ` Michal Marek
0 siblings, 0 replies; 6+ messages in thread
From: Michal Marek @ 2009-12-10 14:12 UTC (permalink / raw)
To: Randy Dunlap
Cc: Sam Ravnborg, Linus Torvalds, linux-kbuild, linux-kernel,
Stephen Rothwell
On 9.12.2009 20:20, Sam Ravnborg wrote:
> On Wed, Dec 09, 2009 at 09:31:08AM -0800, Randy Dunlap wrote:
>> Hi > Michal,
>>
>> Is there anything that tells us when we should/must use
>> <generated/*.h> ?
>
> The original idea was that include/generated/ should
> be used for all generated header files.
>
> I once had a patch applied that used it for other
> generated files - this was a bad idea. Said patch
> was reverted as it had much bigger issues.
>
> So think of it as a place for generated header files only.
> This also warrants the location in include/
>
> But only for 'global' header files. For drivers
> and the like that needs the header file only locally the
> header file should not be located n include/generated,
> as it is only for the global headers.
... and if the question was rather "which #include lines need to be
fixed to use generated/": Most of the "global" generated headers are
used only in a handful of places mostly in arch and a bit in core kernel
code. The only drivers that needed updating were four staging drivers
that included <linux/autoconf.h> explicitely (dropping these includes
was a worthwhile cleanup on it's own) and one staging driver and said
iwlwifi which included <linux/utsrelease.h>. Also the rest of the series
is quite non-intrusive, it affects about 25 source files in arch/,
kernel/ and init/ + makefile cleanups. The most often included
asm/asm-offsets.h header is solved by a wrapper in arch/*/include/asm to
avoid unnecessary conflicts. The win is that we can get rid of the
include/asm symlink and the include2 thing in O= builds.
Michal
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2009-12-10 14:13 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-12-08 13:30 [GIT PULL] kbuild updates for 2.6.33 Michal Marek
2009-12-08 15:14 ` Michal Marek
2009-12-09 9:33 ` Michal Marek
2009-12-09 17:31 ` Randy Dunlap
2009-12-09 19:20 ` Sam Ravnborg
2009-12-10 14:12 ` Michal Marek
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.