diff options
| author | Albert Herranz | 2005-07-12 22:58:34 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2005-07-13 01:01:03 +0200 |
| commit | bc75a24582f60a70e2b95fda94ff66f577b7a0db (patch) | |
| tree | 2b3354c2fb7487a0b9bff53c919e5bd693195b6b | |
| parent | [PATCH] Documentation/kernel-parameters.txt: fix a typo (diff) | |
| download | kernel-qcow2-linux-bc75a24582f60a70e2b95fda94ff66f577b7a0db.tar.gz kernel-qcow2-linux-bc75a24582f60a70e2b95fda94ff66f577b7a0db.tar.xz kernel-qcow2-linux-bc75a24582f60a70e2b95fda94ff66f577b7a0db.zip | |
[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.c | 6 | ||||
| -rw-r--r-- | include/asm-ppc/kexec.h | 2 |
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)( 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 73191310d8db..6d2aa0aa4642 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); |