---

yaml --- r: 4686 b: refs/heads/master c: bc75a24 h: refs/heads/master v: v3
git-mirror · Jul 12, 2005 · 0f25115 · 0f25115
1 parent 03f83dc
commit 0f25115
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41e2e8bec2da8d680a03aa4bee9a09fac499c05f
+refs/heads/master: bc75a24582f60a70e2b95fda94ff66f577b7a0db
diff --git a/trunk/arch/ppc/kernel/machine_kexec.c b/trunk/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/trunk/include/asm-ppc/kexec.h b/trunk/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);