diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-01-12 08:12:44 -0500 |
| commit | dba861461f88c12249ac78fb877866c04f99deb3 (patch) | |
| tree | 5812b143581bcc66c7c542f01ba0cb22e489b8e5 /include/linux/kexec.h | |
| parent | 0e6601eee039893a3f6420596ae4588d90d13cbe (diff) | |
| parent | 228fdc083b017eaf90e578fa86fb1ecfd5ffae87 (diff) | |
Merge branch 'linus' into timers/core
Pick up the latest fixes and refresh the branch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/kexec.h')
| -rw-r--r-- | include/linux/kexec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/kexec.h b/include/linux/kexec.h index d78d28a733b1..5fd33dc1fe3a 100644 --- a/include/linux/kexec.h +++ b/include/linux/kexec.h | |||
| @@ -198,6 +198,9 @@ extern u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4]; | |||
| 198 | extern size_t vmcoreinfo_size; | 198 | extern size_t vmcoreinfo_size; |
| 199 | extern size_t vmcoreinfo_max_size; | 199 | extern size_t vmcoreinfo_max_size; |
| 200 | 200 | ||
| 201 | /* flag to track if kexec reboot is in progress */ | ||
| 202 | extern bool kexec_in_progress; | ||
| 203 | |||
| 201 | int __init parse_crashkernel(char *cmdline, unsigned long long system_ram, | 204 | int __init parse_crashkernel(char *cmdline, unsigned long long system_ram, |
| 202 | unsigned long long *crash_size, unsigned long long *crash_base); | 205 | unsigned long long *crash_size, unsigned long long *crash_base); |
| 203 | int parse_crashkernel_high(char *cmdline, unsigned long long system_ram, | 206 | int parse_crashkernel_high(char *cmdline, unsigned long long system_ram, |