diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-04 19:27:50 -0500 |
| commit | 602d4a7e2f4b843d1a67375d4d7104073495b758 (patch) | |
| tree | 0b9f184e54fa693c27bd5986c114bdcf6949f788 /arch/ppc/kernel/machine_kexec.c | |
| parent | 0bbacc402e67abca8794a8401c1621dc0c0202e9 (diff) | |
| parent | c51e3a417bb0f295e13a5bad86302b5212eafdf3 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc-merge
Diffstat (limited to 'arch/ppc/kernel/machine_kexec.c')
| -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 a72787747df7..a882b0dbe8de 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; | |||
| 32 | * Provide a dummy crash_notes definition while crash dump arrives to ppc. | 32 | * Provide a dummy crash_notes definition while crash dump arrives to ppc. |
| 33 | * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. | 33 | * This prevents breakage of crash_notes attribute in kernel/ksysfs.c. |
| 34 | */ | 34 | */ |
| 35 | void *crash_notes = NULL; | 35 | note_buf_t crash_notes[NR_CPUS]; |
| 36 | 36 | ||
| 37 | void machine_shutdown(void) | 37 | void machine_shutdown(void) |
| 38 | { | 38 | { |