diff options
Diffstat (limited to 'include/asm-powerpc/kexec.h')
| -rw-r--r-- | include/asm-powerpc/kexec.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 6a2af2f6853b..0a1afced173f 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
| @@ -31,9 +31,10 @@ | |||
| 31 | #define KEXEC_ARCH KEXEC_ARCH_PPC | 31 | #define KEXEC_ARCH KEXEC_ARCH_PPC |
| 32 | #endif | 32 | #endif |
| 33 | 33 | ||
| 34 | #ifndef __ASSEMBLY__ | ||
| 35 | |||
| 34 | #ifdef CONFIG_KEXEC | 36 | #ifdef CONFIG_KEXEC |
| 35 | 37 | ||
| 36 | #ifndef __ASSEMBLY__ | ||
| 37 | #ifdef __powerpc64__ | 38 | #ifdef __powerpc64__ |
| 38 | /* | 39 | /* |
| 39 | * This function is responsible for capturing register states if coming | 40 | * This function is responsible for capturing register states if coming |
| @@ -123,8 +124,16 @@ extern int default_machine_kexec_prepare(struct kimage *image); | |||
| 123 | extern void default_machine_crash_shutdown(struct pt_regs *regs); | 124 | extern void default_machine_crash_shutdown(struct pt_regs *regs); |
| 124 | 125 | ||
| 125 | extern void machine_kexec_simple(struct kimage *image); | 126 | extern void machine_kexec_simple(struct kimage *image); |
| 127 | extern int overlaps_crashkernel(unsigned long start, unsigned long size); | ||
| 128 | |||
| 129 | #else /* !CONFIG_KEXEC */ | ||
| 130 | |||
| 131 | static inline int overlaps_crashkernel(unsigned long start, unsigned long size) | ||
| 132 | { | ||
| 133 | return 0; | ||
| 134 | } | ||
| 126 | 135 | ||
| 127 | #endif /* ! __ASSEMBLY__ */ | ||
| 128 | #endif /* CONFIG_KEXEC */ | 136 | #endif /* CONFIG_KEXEC */ |
| 137 | #endif /* ! __ASSEMBLY__ */ | ||
| 129 | #endif /* __KERNEL__ */ | 138 | #endif /* __KERNEL__ */ |
| 130 | #endif /* _ASM_POWERPC_KEXEC_H */ | 139 | #endif /* _ASM_POWERPC_KEXEC_H */ |
