diff options
| author | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 15:35:45 +1100 |
|---|---|---|
| committer | Michael Ellerman <michael@ellerman.id.au> | 2005-11-03 15:35:45 +1100 |
| commit | e1df870d546f4d033030615aa3d01c0341c1ef1f (patch) | |
| tree | 67621ddb359f503ba4a01f777313740ab479a849 /arch | |
| parent | a1218720321d778134914cf90ef54cf0d1d8477c (diff) | |
| download | linux-3.10-e1df870d546f4d033030615aa3d01c0341c1ef1f.tar.gz linux-3.10-e1df870d546f4d033030615aa3d01c0341c1ef1f.tar.bz2 linux-3.10-e1df870d546f4d033030615aa3d01c0341c1ef1f.zip | |
powerpc: Merge asm-ppc/kexec.h and asm-ppc64/kexec.h
Merge include/asm-ppc/kexec.h and include/asm-ppc64/kexec.h.
The only thing that's really changed is that we now allocate crash_notes
properly on PPC32. It's address is exported via sysfs, so it's not correct
for it to be a pointer.
I've also removed some of the "we don't use this" comments, because they're
wrong (or perhaps were referring only to arch code).
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Diffstat (limited to 'arch')
| -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) { |