diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-12-30 01:53:57 +0100 |
| commit | fbd22402164e687fd1be9a1372ee4f6b9373c860 (patch) | |
| tree | fd86c8b2f8ed120a2229a1de7959f0d4e56c8008 /kernel/kexec.c | |
| parent | f78c4cffb86a9f1732674d810ac338cd694b1885 (diff) | |
| parent | c606850407d9096415e226c75a871d0650404446 (diff) | |
| download | talos-obmc-linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.tar.gz talos-obmc-linux-fbd22402164e687fd1be9a1372ee4f6b9373c860.zip | |
Merge back earlier 'pm-sleep' material.
Diffstat (limited to 'kernel/kexec.c')
| -rw-r--r-- | kernel/kexec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c index 490afc03627e..d0d8fca54065 100644 --- a/kernel/kexec.c +++ b/kernel/kexec.c @@ -47,6 +47,9 @@ u32 vmcoreinfo_note[VMCOREINFO_NOTE_SIZE/4]; size_t vmcoreinfo_size; size_t vmcoreinfo_max_size = sizeof(vmcoreinfo_data); +/* Flag to indicate we are going to kexec a new kernel */ +bool kexec_in_progress = false; + /* Location of the reserved area for the crash kernel */ struct resource crashk_res = { .name = "Crash kernel", @@ -1675,6 +1678,7 @@ int kernel_kexec(void) } else #endif { + kexec_in_progress = true; kernel_restart_prepare(NULL); printk(KERN_EMERG "Starting new kernel\n"); machine_shutdown(); |
