diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-11-15 04:51:40 -0500 |
| commit | f055408957750cf759162c364c2a4dfe19765844 (patch) | |
| tree | aecc0a13c582d310902e6fa95d8853c627828fcc /include/asm-powerpc/kexec.h | |
| parent | 83cbd33aae2c3cd14f80a8abf733033a57aa4923 (diff) | |
| parent | 4060994c3e337b40e0f6fa8ce2cc178e021baf3d (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-powerpc/kexec.h')
| -rw-r--r-- | include/asm-powerpc/kexec.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 062ab9ba68eb..c72ffc709ea8 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
| @@ -40,6 +40,7 @@ extern note_buf_t crash_notes[]; | |||
| 40 | #ifdef __powerpc64__ | 40 | #ifdef __powerpc64__ |
| 41 | extern void kexec_smp_wait(void); /* get and clear naca physid, wait for | 41 | extern void kexec_smp_wait(void); /* get and clear naca physid, wait for |
| 42 | master to copy new code to 0 */ | 42 | master to copy new code to 0 */ |
| 43 | extern void __init kexec_setup(void); | ||
| 43 | #else | 44 | #else |
| 44 | struct kimage; | 45 | struct kimage; |
| 45 | extern void machine_kexec_simple(struct kimage *image); | 46 | extern void machine_kexec_simple(struct kimage *image); |