[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-Id: <1218099923.5164.32.camel@caritas-dev.intel.com>
Date: Thu, 07 Aug 2008 17:05:23 +0800
From: Huang Ying <ying.huang@...el.com>
To: "Eric W. Biederman" <ebiederm@...ssion.com>,
Pavel Machek <pavel@....cz>, nigel@...el.suspend2.net,
"Rafael J. Wysocki" <rjw@...k.pl>,
Andrew Morton <akpm@...ux-foundation.org>,
Vivek Goyal <vgoyal@...hat.com>, mingo@...e.hu,
Linus Torvalds <torvalds@...ux-foundation.org>
Cc: linux-kernel@...r.kernel.org,
Kexec Mailing List <kexec@...ts.infradead.org>
Subject: [PATCH 1/6] 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@...el.com>
---
kernel/kexec.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
--- a/kernel/kexec.c
+++ b/kernel/kexec.c
@@ -1427,8 +1427,6 @@ static int __init crash_save_vmcoreinfo_
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.
*/
@@ -1443,8 +1441,8 @@ int kernel_kexec(void)
goto Unlock;
}
- if (kexec_image->preserve_context) {
#ifdef CONFIG_KEXEC_JUMP
+ if (kexec_image->preserve_context) {
mutex_lock(&pm_mutex);
pm_prepare_console();
error = freeze_processes();
@@ -1471,8 +1469,9 @@ int kernel_kexec(void)
if (error)
goto Enable_irqs;
save_processor_state();
+ } else
#endif
- } else {
+ {
blocking_notifier_call_chain(&reboot_notifier_list,
SYS_RESTART, NULL);
system_state = SYSTEM_RESTART;
@@ -1484,8 +1483,8 @@ int kernel_kexec(void)
machine_kexec(kexec_image);
- if (kexec_image->preserve_context) {
#ifdef CONFIG_KEXEC_JUMP
+ if (kexec_image->preserve_context) {
restore_processor_state();
device_power_up(PMSG_RESTORE);
Enable_irqs:
@@ -1499,8 +1498,8 @@ int kernel_kexec(void)
Restore_console:
pm_restore_console();
mutex_unlock(&pm_mutex);
-#endif
}
+#endif
Unlock:
xchg(&kexec_lock, 0);
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists