kexec jump: clean up #ifdef and comments
Subsystems (3)
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().
--- kernel/kexec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/kexec.c +5 -6
@@ -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 );
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Hi!
Quoted 13 lines
CONFIG_KEXEC_JUMPto make code looks cleaner.Fix no longer correct comments of
kernel_kexec().Signed-off-by Huang Ying <[email protected]>--- kernel/kexec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
kernel/kexec.c static int __init crash_save_vmcoreinfo_ · line 1432
Quoted 8 lines
kernel/kexec.c +0
-2@@ -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. */
If it is not kerneldoc, it should not be /** .
Pavel
Signature · 7 lines
(english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Quoted 17 lines · Pavel Machek
Hi!
Quoted 15 lines
CONFIG_KEXEC_JUMPto make code looks cleaner.Fix no longer correct comments of
kernel_kexec().Signed-off-by Huang Ying <[email protected]>--- kernel/kexec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)kernel/kexec.c +0
-0@@ -1427,8 +1427,6 @@ static int __init crash_save_vmcoreinfo_module_init (crash_save_vmcoreinfo_init)
Quoted 8 lines
kernel/kexec.c static int __init crash_save_vmcoreinfo_ · line 1432
Quoted 6 lines
kernel/kexec.c +0
-2/** -* kernel_kexec - reboot the system -* * Move into place and start executing a preloaded standalone * executable. If nothing was preloaded return an error. */ If it is not kerneldoc, it should not be /** .
OK. I will fix it.
Best Regards,
Huang Ying
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec
Quoted 54 lines · Huang Ying
Move if (
kexec_image->preserve_context) { ... } into #ifdefCONFIG_KEXEC_JUMPto make code looks cleaner.Fix no longer correct comments of
kernel_kexec().Signed-off-by Huang Ying <[email protected]>--- kernel/kexec.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)kernel/kexec.c +4
-5@@ -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:
kernel/kexec.c int kernel_kexec(void) · line 1505
Quoted 9 lines
kernel/kexec.c +1
-1@@ -1499,8 +1498,8 @@ int kernel_kexec(void) Restore_console:pm_restore_console (); mutex_unlock(&pm_mutex); -#endif } +#endif Unlock:xchg (&kexec_lock,0 );
Thanks Huang. Looks good to me.
Thanks
Vivek
_______________________________________________
kexec mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/kexec