OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kexec jump: clean up #ifdef and comments 

Move if (kexec_image->preserve_context) { ...  } into #ifdef
CONFIG_KEXEC_JUMP to make code looks cleaner.

Fix no longer correct comments of kernel_kexec().

Signed-off-by: Huang Ying <ying.huang@intel.com>
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Huang Ying 2008-08-15 00:40:21 -07:00 committed by Linus Torvalds
parent 4cd69b986e
commit 7ade3fcc1f
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kernel/kexec.c
View File

@ -1426,11 +1426,9 @@ static int __init crash_save_vmcoreinfo_init(void)
module_init(crash_save_vmcoreinfo_init) module_init(crash_save_vmcoreinfo_init)
/** /*
* kernel_kexec - reboot the system * Move into place and start executing a preloaded standalone
* * executable. If nothing was preloaded return an error.
* Move into place and start executing a preloaded standalone
* executable. If nothing was preloaded return an error.
*/ */
int kernel_kexec(void) int kernel_kexec(void)
{ {
@ -1443,8 +1441,8 @@ int kernel_kexec(void)
goto Unlock; goto Unlock;
} }
if (kexec_image->preserve_context) {
#ifdef CONFIG_KEXEC_JUMP #ifdef CONFIG_KEXEC_JUMP
if (kexec_image->preserve_context) {
mutex_lock(&pm_mutex); mutex_lock(&pm_mutex);
pm_prepare_console(); pm_prepare_console();
error = freeze_processes(); error = freeze_processes();
@ -1471,8 +1469,9 @@ int kernel_kexec(void)
if (error) if (error)
goto Enable_irqs; goto Enable_irqs;
save_processor_state(); save_processor_state();
} else
#endif #endif
} else { {
blocking_notifier_call_chain(&reboot_notifier_list, blocking_notifier_call_chain(&reboot_notifier_list,
SYS_RESTART, NULL); SYS_RESTART, NULL);
system_state = SYSTEM_RESTART; system_state = SYSTEM_RESTART;
@ -1484,8 +1483,8 @@ int kernel_kexec(void)
machine_kexec(kexec_image); machine_kexec(kexec_image);
if (kexec_image->preserve_context) {
#ifdef CONFIG_KEXEC_JUMP #ifdef CONFIG_KEXEC_JUMP
if (kexec_image->preserve_context) {
restore_processor_state(); restore_processor_state();
device_power_up(PMSG_RESTORE); device_power_up(PMSG_RESTORE);
Enable_irqs: Enable_irqs:
@ -1499,8 +1498,8 @@ int kernel_kexec(void)
Restore_console: Restore_console:
pm_restore_console(); pm_restore_console();
mutex_unlock(&pm_mutex); mutex_unlock(&pm_mutex);
#endif
} }
#endif
Unlock: Unlock:
if (!xchg(&kexec_lock, 0)) if (!xchg(&kexec_lock, 0))