diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-04 16:17:32 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-04 16:17:32 +1100 |
| commit | 292a6c58e9133b57d004d92a846fff326dd31e92 (patch) | |
| tree | a267d1881a9a0bcb69938becd0c182874cd6c19c /arch/ppc | |
| parent | 8ad200d7b7c8fac77cf705831e90e889360d7030 (diff) | |
| parent | dc3a9efb5ee89493a42c3365d219e339e4720c2b (diff) | |
Merge branch 'for-paulus' of git://kernel/home/michael/src/work/
Diffstat (limited to 'arch/ppc')
| -rw-r--r-- | arch/ppc/kernel/machine_kexec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc/kernel/machine_kexec.c b/arch/ppc/kernel/machine_kexec.c index a72787747df..a882b0dbe8d 100644 --- a/arch/ppc/kernel/machine_kexec.c +++ b/arch/ppc/kernel/machine_kexec.c @@ -32,7 +32,7 @@ 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; +note_buf_t crash_notes[NR_CPUS]; void machine_shutdown(void) { |