Merge branch 'master'

[linux-2.6] / arch / ppc / kernel / machine_kexec.c

diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c
index 84d65a87191ed6048a81eee508e43d1629055f9b..a882b0dbe8de3e4b28b4216b5d6ed25076b69253 100644 (file)
--- 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.
+ */
+note_buf_t crash_notes[NR_CPUS];
+
 void machine_shutdown(void)
 {
        if (ppc_md.machine_shutdown)