diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2006-05-17 21:16:11 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:18 -0400 |
commit | 35dd54326e857f1648c7cc1028e8d5e1dbe04992 (patch) | |
tree | dea05effa25bc751d1b777a0b80f0f46d3ff0b8e /include | |
parent | 473104134b35ce1c3ca77b738c561d6c215adc1b (diff) |
[PATCH] powerpc: Move crashkernel= handling into the kernel.
This was missing a quilt ref.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-powerpc/kexec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-powerpc/kexec.h b/include/asm-powerpc/kexec.h index 0a1afced173f..efe8872ec583 100644 --- a/include/asm-powerpc/kexec.h +++ b/include/asm-powerpc/kexec.h | |||
@@ -125,6 +125,7 @@ extern void default_machine_crash_shutdown(struct pt_regs *regs); | |||
125 | 125 | ||
126 | 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); | 127 | extern int overlaps_crashkernel(unsigned long start, unsigned long size); |
128 | extern void reserve_crashkernel(void); | ||
128 | 129 | ||
129 | #else /* !CONFIG_KEXEC */ | 130 | #else /* !CONFIG_KEXEC */ |
130 | 131 | ||
@@ -133,6 +134,8 @@ static inline int overlaps_crashkernel(unsigned long start, unsigned long size) | |||
133 | return 0; | 134 | return 0; |
134 | } | 135 | } |
135 | 136 | ||
137 | static inline void reserve_crashkernel(void) { ; } | ||
138 | |||
136 | #endif /* CONFIG_KEXEC */ | 139 | #endif /* CONFIG_KEXEC */ |
137 | #endif /* ! __ASSEMBLY__ */ | 140 | #endif /* ! __ASSEMBLY__ */ |
138 | #endif /* __KERNEL__ */ | 141 | #endif /* __KERNEL__ */ |