diff options
| author | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 19:03:13 +0000 | 
|---|---|---|
| committer | Wim Van Sebroeck <wim@iguana.be> | 2007-05-11 19:03:13 +0000 | 
| commit | 5c34202b8bf942da411b6599668a76b07449bbfd (patch) | |
| tree | 5719c361321eaddc8e4f1b0c8a7994f0e9a6fdd3 /kernel/kexec.c | |
| parent | 0d4804b31f91cfbcff6d62af0bc09a893a1c8ae0 (diff) | |
| parent | 1f8a6b658a943b4f04a1fc7b3a420360202c86cd (diff) | |
Merge /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 4 | 
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 2a59c8a01ae..25db14b89e8 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -1118,8 +1118,8 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)  	memset(&prstatus, 0, sizeof(prstatus));  	prstatus.pr_pid = current->pid;  	elf_core_copy_regs(&prstatus.pr_reg, regs); -	buf = append_elf_note(buf, "CORE", NT_PRSTATUS, &prstatus, -				sizeof(prstatus)); +	buf = append_elf_note(buf, KEXEC_CORE_NOTE_NAME, NT_PRSTATUS, +		      	      &prstatus, sizeof(prstatus));  	final_note(buf);  }  | 
