This is a note to let you know that I've just added the patch titled
powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
to the 2.6.32-longterm tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/longterm/longterm-queue-2.6.32.git;a=summary
The filename of the patch is:
powerpc-kexec-add-ifdef-config_ppc_std_mmu_64-to-ppc64-code.patch
and it can be found in the queue-2.6.32 subdirectory.
If you, or anyone else, feels it should not be added to the 2.6.32 longterm
tree,
please let <[email protected]> know about it.
>From [email protected] Mon Apr 11 15:53:13 2011
From: Kamalesh Babulal <[email protected]>
Date: Wed, 6 Apr 2011 18:31:45 +0530
Subject: powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
To: Greg KH <[email protected]>
Cc: Ben Hutchings <[email protected]>, [email protected], Debian kernel
maintainers <[email protected]>, [email protected],
"Adam D. Barratt" <[email protected]>, [email protected],
[email protected], [email protected], [email protected], dann frazier
<[email protected]>, [email protected]
Message-ID: <[email protected]>
Content-Disposition: inline
From: Kamalesh Babulal <[email protected]>
powerpc/kexec: Add ifdef CONFIG_PPC_STD_MMU_64 to PPC64 code
This patch introduces PPC64 specific #ifdef bits from the upstream
commit: b3df895aebe091b1657a42a8c859bd49fc96646b.
Reported-and-tested-by: dann frazier <[email protected]>
Signed-off-by: Kumar Gala <[email protected]>
Signed-off-by: Kamalesh Babulal <[email protected]>
cc: Benjamin Herrenschmidt <[email protected]>
cc: Anton Blanchard <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
arch/powerpc/kernel/crash.c | 4 ++++
1 file changed, 4 insertions(+)
--- a/arch/powerpc/kernel/crash.c
+++ b/arch/powerpc/kernel/crash.c
@@ -163,6 +163,7 @@ static void crash_kexec_prepare_cpus(int
}
/* wait for all the CPUs to hit real mode but timeout if they don't come in */
+#ifdef CONFIG_PPC_STD_MMU_64
static void crash_kexec_wait_realmode(int cpu)
{
unsigned int msecs;
@@ -187,6 +188,7 @@ static void crash_kexec_wait_realmode(in
}
mb();
}
+#endif
/*
* This function will be called by secondary cpus or by kexec cpu
@@ -445,7 +447,9 @@ void default_machine_crash_shutdown(stru
crash_kexec_prepare_cpus(crashing_cpu);
cpu_set(crashing_cpu, cpus_in_crash);
crash_kexec_stop_spus();
+#ifdef CONFIG_PPC_STD_MMU_64
crash_kexec_wait_realmode(crashing_cpu);
+#endif
if (ppc_md.kexec_cpu_down)
ppc_md.kexec_cpu_down(1, 0);
}
Patches currently in longterm-queue-2.6.32 which might be from
[email protected] are
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/powerpc-fix-default_machine_crash_shutdown-ifdef-botch.patch
/home/gregkh/linux/longterm/longterm-queue-2.6.32/queue-2.6.32/powerpc-kexec-add-ifdef-config_ppc_std_mmu_64-to-ppc64-code.patch
_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable