Hi, This fixes a very recent compilation breakage on 32-bit x86. Please apply. Thanks, Rafael --- From: Rafael J. Wysocki <rjw@sisk.pl> x86: Add missing idle.h include to process_32.c Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl> --- arch/x86/kernel/process_32.c | 1 + 1 file changed, 1 insertion(+) Index: linux-2.6/arch/x86/kernel/process_32.c =================================================================== --- linux-2.6.orig/arch/x86/kernel/process_32.c +++ linux-2.6/arch/x86/kernel/process_32.c @@ -55,6 +55,7 @@ #include <asm/tlbflush.h> #include <asm/cpu.h> #include <asm/kdebug.h> +#include <asm/idle.h> asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); --
the fix is queued up in tip/timers/urgent - sorry about that. Ingo --
Linus,
Please pull the latest timers-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git timers-fixes-for-linus
Thanks,
Ingo
------------------>
Marc Dionne (1):
x86: prevent stale state of c1e_mask across CPU offline/online, fix
arch/x86/kernel/process_32.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index 4b3cfdf..31f40b2 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -55,6 +55,7 @@
#include <asm/tlbflush.h>
#include <asm/cpu.h>
#include <asm/kdebug.h>
+#include <asm/idle.h>
asmlinkage void ret_from_fork(void) __asm__("ret_from_fork");
--
Is that all the changeset comment ? Am I the only one to find that totally useless ? Or is that the mail doesn't contain the actual comment, only the title followed by the patch ? Cheers, --
yeah. The build error is something like: arch/x86/kernel/process_32.c:78: warning: data definition has no type or storage class arch/x86/kernel/process_32.c:78: warning: type defaults to 'int' in declaration of 'c1e_remove_cpu' arch/x86/kernel/process_32.c:78: warning: parameter names (without types) in function declaration Ingo --
Allright, so in fact, it's more like the log doesn't match the patch in the email.. --
only because i already picked up a different submission at that time, and posted in this thread. i picked up this one from lkml: Subject: [PATCH] Fix build error introduced by commit 4faac97d44ac27bdbb010a9c3597401a8f89341f see the full commit log below, it has all the details. Ingo ------------> From 1eda81495a49a4ee91d8863b0a441a624375efea Mon Sep 17 00:00:00 2001 From: Marc Dionne <marc.c.dionne@gmail.com> Date: Tue, 23 Sep 2008 22:40:02 -0400 Subject: [PATCH] x86: prevent stale state of c1e_mask across CPU offline/online, fix Fix build error introduced by commit 4faac97d44ac27 ("x86: prevent stale state of c1e_mask across CPU offline/online"). process_32.c needs to include idle.h to get the prototype for c1e_remove_cpu() Signed-off-by: Marc Dionne <marc.c.dionne@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> --- arch/x86/kernel/process_32.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 4b3cfdf..31f40b2 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -55,6 +55,7 @@ #include <asm/tlbflush.h> #include <asm/cpu.h> #include <asm/kdebug.h> +#include <asm/idle.h> asmlinkage void ret_from_fork(void) __asm__("ret_from_fork"); --
