[git pull] core kernel fixes

From: Ingo Molnar
Date: Fri Oct 17 2008 - 02:24:13 EST

* Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> 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.


----- Forwarded message from Ingo Molnar <mingo@xxxxxxx> -----

Date: Wed, 15 Oct 2008 18:29:01 +0200
From: Ingo Molnar <mingo@xxxxxxx>
To: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
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.


----- End forwarded message -----


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



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>
+#include <asm/types.h>
#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
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/