aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlbert Herranz <albert_herranz@yahoo.es>2005-07-12 16:58:34 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-12 19:01:03 -0400
commitbc75a24582f60a70e2b95fda94ff66f577b7a0db (patch)
tree2b3354c2fb7487a0b9bff53c919e5bd693195b6b
parent41e2e8bec2da8d680a03aa4bee9a09fac499c05f (diff)
[PATCH] kexec-ppc: fix for ksysfs crash_notes
The following patch prevents the crash dump helper code found within kexec from breaking ppc which still lacks crash dump functionality. ksysfs crash_notes attribute handling was left under CONFIG_KEXEC for simplicity although it is not strictly kexec related. We provide here a dummy definition for crash_notes on ppc. Signed-off-by: Albert Herranz <albert_herranz@yahoo.es> Cc: Eric Biederman <ebiederm@xmission.com> Cc: Vivek Goyal <vgoyal@in.ibm.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--arch/ppc/kernel/machine_kexec.c6
-rw-r--r--include/asm-ppc/kexec.h2
2 files changed, 8 insertions, 0 deletions
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c
index 84d65a87191e..a72787747df7 100644
--- a/arch/ppc/kernel/machine_kexec.c
+++ b/arch/ppc/kernel/machine_kexec.c
@@ -28,6 +28,12 @@ typedef NORET_TYPE void (*relocate_new_kernel_t)(
28const extern unsigned char relocate_new_kernel[]; 28const extern unsigned char relocate_new_kernel[];
29const extern unsigned int relocate_new_kernel_size; 29const extern unsigned int relocate_new_kernel_size;
30 30
31/*
32 * Provide a dummy crash_notes definition while crash dump arrives to ppc.
33 * This prevents breakage of crash_notes attribute in kernel/ksysfs.c.
34 */
35void *crash_notes = NULL;
36
31void machine_shutdown(void) 37void machine_shutdown(void)
32{ 38{
33 if (ppc_md.machine_shutdown) 39 if (ppc_md.machine_shutdown)
diff --git a/include/asm-ppc/kexec.h b/include/asm-ppc/kexec.h
index 73191310d8db..6d2aa0aa4642 100644
--- a/include/asm-ppc/kexec.h
+++ b/include/asm-ppc/kexec.h
@@ -27,6 +27,8 @@
27 27
28#ifndef __ASSEMBLY__ 28#ifndef __ASSEMBLY__
29 29
30extern void *crash_notes;
31
30struct kimage; 32struct kimage;
31 33
32extern void machine_kexec_simple(struct kimage *image); 34extern void machine_kexec_simple(struct kimage *image);