Messages in this thread Patch in this message | | | Date | Fri, 17 Oct 2008 08:23:31 +0200 | From | Ingo Molnar <> | Subject | [git pull] core kernel fixes |
| |
* Linus Torvalds <torvalds@linux-foundation.org> wrote:
> > softirq, warning fix: correct a format to avoid a warning > > Ingo, stop dicking around with this crap. You apparently fixed some > warning that I never saw by turning it into a warning that I _do_ see:
yes, sorry - i noticed the new warning too and notified you two days ago (see the mail below) but got held up by the ftrace stuff. I have two other core/urgent fixes queued up as well - see the pull request below.
Ingo
----- Forwarded message from Ingo Molnar <mingo@elte.hu> -----
Date: Wed, 15 Oct 2008 18:29:01 +0200 From: Ingo Molnar <mingo@elte.hu> To: Linus Torvalds <torvalds@linux-foundation.org> Subject: Re: [git pull] core kernel updates for v2.6.28
something i just noticed:
> core/softirq
> softirq, warning fix: correct a format to avoid a warning
Sorry, this warning fix was not complete and will produce a new warning on 64-bit x86. Will queue up a fix.
Ingo
----- End forwarded message -----
Linus,
Please pull the latest core-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus
Thanks,
Ingo
------------------> Ingo Molnar (1): m32r: fix build due to notify_cpu_starting() change
Stephen Rothwell (1): powerpc: fix linux-next build failure
arch/m32r/kernel/smpboot.c | 1 + arch/powerpc/include/asm/page.h | 6 +++++- 2 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/m32r/kernel/smpboot.c b/arch/m32r/kernel/smpboot.c index fc29948..39cb6da 100644 --- a/arch/m32r/kernel/smpboot.c +++ b/arch/m32r/kernel/smpboot.c @@ -40,6 +40,7 @@ */ #include <linux/module.h> +#include <linux/cpu.h> #include <linux/init.h> #include <linux/kernel.h> #include <linux/mm.h> diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h index e088545..94fe513 100644 --- a/arch/powerpc/include/asm/page.h +++ b/arch/powerpc/include/asm/page.h @@ -10,9 +10,13 @@ * 2 of the License, or (at your option) any later version. */ +#ifndef __ASSEMBLY__ +#include <linux/types.h> +#else +#include <asm/types.h> +#endif #include <asm/asm-compat.h> #include <asm/kdump.h> -#include <asm/types.h> /* * On PPC32 page size is 4K. For PPC64 we support either 4K or 64K software
| |