From: Vivek Goyal <vgoyal@redhat.com>
To: Huang Ying <ying.huang@intel.com>
Cc: nigel@nigel.suspend2.net,
Kexec Mailing List <kexec@lists.infradead.org>,
linux-kernel@vger.kernel.org, "Rafael J. Wysocki" <rjw@sisk.pl>,
"Eric W. Biederman" <ebiederm@xmission.com>,
Pavel Machek <pavel@ucw.cz>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
mingo@elte.hu
Subject: Re: [PATCH 1/6] kexec jump: clean up #ifdef and comments
Date: Thu, 7 Aug 2008 09:04:01 -0400 [thread overview]
Message-ID: <20080807130401.GA27783@redhat.com> (raw)
In-Reply-To: <1218099923.5164.32.camel@caritas-dev.intel.com>
On Thu, Aug 07, 2008 at 05:05:23PM +0800, Huang Ying wrote:
> 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>
>
> ---
> 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);
Thanks Huang. Looks good to me.
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Thanks
Vivek
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
WARNING: multiple messages have this Message-ID (diff)
From: Vivek Goyal <vgoyal@redhat.com>
To: Huang Ying <ying.huang@intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
Pavel Machek <pavel@ucw.cz>,
nigel@nigel.suspend2.net, "Rafael J. Wysocki" <rjw@sisk.pl>,
Andrew Morton <akpm@linux-foundation.org>,
mingo@elte.hu, Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org,
Kexec Mailing List <kexec@lists.infradead.org>
Subject: Re: [PATCH 1/6] kexec jump: clean up #ifdef and comments
Date: Thu, 7 Aug 2008 09:04:01 -0400 [thread overview]
Message-ID: <20080807130401.GA27783@redhat.com> (raw)
In-Reply-To: <1218099923.5164.32.camel@caritas-dev.intel.com>
On Thu, Aug 07, 2008 at 05:05:23PM +0800, Huang Ying wrote:
> 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>
>
> ---
> 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);
Thanks Huang. Looks good to me.
Acked-by: Vivek Goyal <vgoyal@redhat.com>
Thanks
Vivek
next prev parent reply other threads:[~2008-08-07 13:04 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-07 9:05 [PATCH 1/6] kexec jump: clean up #ifdef and comments Huang Ying
2008-08-07 9:05 ` Huang Ying
2008-08-07 9:20 ` Pavel Machek
2008-08-07 9:20 ` Pavel Machek
2008-08-07 9:29 ` Huang Ying
2008-08-07 9:29 ` Huang Ying
2008-08-07 13:04 ` Vivek Goyal [this message]
2008-08-07 13:04 ` Vivek Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080807130401.GA27783@redhat.com \
--to=vgoyal@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=kexec@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=nigel@nigel.suspend2.net \
--cc=pavel@ucw.cz \
--cc=rjw@sisk.pl \
--cc=torvalds@linux-foundation.org \
--cc=ying.huang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.