diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:48:05 +0900 |
| commit | ef4ed97d6bd91aa41907181e80a7feaf2721719a (patch) | |
| tree | adc44e858c150c41ebf1dd7c6ee2f6bcbac75502 /arch/sh/include/asm/kexec.h | |
| parent | c5eb5b372e7ea18a5eeb6b5192a6369967cb1afe (diff) | |
| parent | 21823259a70b7a2a21eea1d48c25a6f38896dd11 (diff) | |
| download | talos-op-linux-ef4ed97d6bd91aa41907181e80a7feaf2721719a.tar.gz talos-op-linux-ef4ed97d6bd91aa41907181e80a7feaf2721719a.zip | |
Merge branch 'sh/lmb'
Conflicts:
arch/sh/kernel/setup.c
Diffstat (limited to 'arch/sh/include/asm/kexec.h')
| -rw-r--r-- | arch/sh/include/asm/kexec.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/sh/include/asm/kexec.h b/arch/sh/include/asm/kexec.h index 765a5e1660fc..ad6ef8a275ee 100644 --- a/arch/sh/include/asm/kexec.h +++ b/arch/sh/include/asm/kexec.h @@ -26,6 +26,10 @@ /* The native architecture */ #define KEXEC_ARCH KEXEC_ARCH_SH +#ifdef CONFIG_KEXEC +/* arch/sh/kernel/machine_kexec.c */ +void reserve_crashkernel(void); + static inline void crash_setup_regs(struct pt_regs *newregs, struct pt_regs *oldregs) { @@ -59,4 +63,8 @@ static inline void crash_setup_regs(struct pt_regs *newregs, newregs->pc = (unsigned long)current_text_addr(); } } +#else +static inline void reserve_crashkernel(void) { } +#endif /* CONFIG_KEXEC */ + #endif /* __ASM_SH_KEXEC_H */ |
