From: Albert Herranz Date: Tue, 12 Jul 2005 20:58:34 +0000 (-0700) Subject: [PATCH] kexec-ppc: fix for ksysfs crash_notes X-Git-Tag: v2.6.13-rc3~32 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=bc75a24582f60a70e2b95fda94ff66f577b7a0db;p=linux-2.6-omap-h63xx.git [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 Cc: Eric Biederman Cc: Vivek Goyal Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c index 84d65a87191..a72787747df 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)( const extern unsigned char relocate_new_kernel[]; const extern unsigned int relocate_new_kernel_size; +/* + * Provide a dummy crash_notes definition while crash dump arrives to ppc. + * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. + */ +void *crash_notes = NULL; + void machine_shutdown(void) { if (ppc_md.machine_shutdown) diff --git a/include/asm-ppc/kexec.h b/include/asm-ppc/kexec.h index 73191310d8d..6d2aa0aa464 100644 --- a/include/asm-ppc/kexec.h +++ b/include/asm-ppc/kexec.h @@ -27,6 +27,8 @@ #ifndef __ASSEMBLY__ +extern void *crash_notes; + struct kimage; extern void machine_kexec_simple(struct kimage *image);