* [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
@ 2012-03-19 9:30 ` Jan Beulich
0 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2012-03-19 9:30 UTC (permalink / raw)
To: wim, Konrad Rzeszutek Wilk
Cc: Ian Campbell, Wouter de Geus, xen-devel, linux-watchdog
This was found to be a problem particularly after guest migration.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
---
drivers/watchdog/xen_wdt.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- 3.3/drivers/watchdog/xen_wdt.c
+++ 3.3-xen-watchdog-resume/drivers/watchdog/xen_wdt.c
@@ -299,11 +299,18 @@ static void xen_wdt_shutdown(struct plat
static int xen_wdt_suspend(struct platform_device *dev, pm_message_t state)
{
- return xen_wdt_stop();
+ typeof(wdt.id) id = wdt.id;
+ int rc = xen_wdt_stop();
+
+ wdt.id = id;
+ return rc;
}
static int xen_wdt_resume(struct platform_device *dev)
{
+ if (!wdt.id)
+ return 0;
+ wdt.id = 0;
return xen_wdt_start();
}
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
@ 2012-03-19 9:30 ` Jan Beulich
0 siblings, 0 replies; 6+ messages in thread
From: Jan Beulich @ 2012-03-19 9:30 UTC (permalink / raw)
To: wim, Konrad Rzeszutek Wilk
Cc: linux-watchdog, Wouter de Geus, Ian Campbell, xen-devel
This was found to be a problem particularly after guest migration.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
---
drivers/watchdog/xen_wdt.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
--- 3.3/drivers/watchdog/xen_wdt.c
+++ 3.3-xen-watchdog-resume/drivers/watchdog/xen_wdt.c
@@ -299,11 +299,18 @@ static void xen_wdt_shutdown(struct plat
static int xen_wdt_suspend(struct platform_device *dev, pm_message_t state)
{
- return xen_wdt_stop();
+ typeof(wdt.id) id = wdt.id;
+ int rc = xen_wdt_stop();
+
+ wdt.id = id;
+ return rc;
}
static int xen_wdt_resume(struct platform_device *dev)
{
+ if (!wdt.id)
+ return 0;
+ wdt.id = 0;
return xen_wdt_start();
}
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
2012-03-19 9:30 ` Jan Beulich
@ 2012-03-21 17:23 ` Konrad Rzeszutek Wilk
-1 siblings, 0 replies; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-03-21 17:23 UTC (permalink / raw)
To: Jan Beulich, wim
Cc: wim, Ian Campbell, Wouter de Geus, xen-devel, linux-watchdog
On Mon, Mar 19, 2012 at 09:30:33AM +0000, Jan Beulich wrote:
> This was found to be a problem particularly after guest migration.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
> Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
> Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
Looks good to me.
Wim, would you like me to carry it for 3.4 or are you OK doing it?
Thanks!
>
> ---
> drivers/watchdog/xen_wdt.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> --- 3.3/drivers/watchdog/xen_wdt.c
> +++ 3.3-xen-watchdog-resume/drivers/watchdog/xen_wdt.c
> @@ -299,11 +299,18 @@ static void xen_wdt_shutdown(struct plat
>
> static int xen_wdt_suspend(struct platform_device *dev, pm_message_t state)
> {
> - return xen_wdt_stop();
> + typeof(wdt.id) id = wdt.id;
> + int rc = xen_wdt_stop();
> +
> + wdt.id = id;
> + return rc;
> }
>
> static int xen_wdt_resume(struct platform_device *dev)
> {
> + if (!wdt.id)
> + return 0;
> + wdt.id = 0;
> return xen_wdt_start();
> }
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
@ 2012-03-21 17:23 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 6+ messages in thread
From: Konrad Rzeszutek Wilk @ 2012-03-21 17:23 UTC (permalink / raw)
To: Jan Beulich; +Cc: linux-watchdog, wim, Wouter de Geus, Ian Campbell, xen-devel
On Mon, Mar 19, 2012 at 09:30:33AM +0000, Jan Beulich wrote:
> This was found to be a problem particularly after guest migration.
>
> Signed-off-by: Jan Beulich <jbeulich@suse.com>
> Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
> Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
> Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
Looks good to me.
Wim, would you like me to carry it for 3.4 or are you OK doing it?
Thanks!
>
> ---
> drivers/watchdog/xen_wdt.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> --- 3.3/drivers/watchdog/xen_wdt.c
> +++ 3.3-xen-watchdog-resume/drivers/watchdog/xen_wdt.c
> @@ -299,11 +299,18 @@ static void xen_wdt_shutdown(struct plat
>
> static int xen_wdt_suspend(struct platform_device *dev, pm_message_t state)
> {
> - return xen_wdt_stop();
> + typeof(wdt.id) id = wdt.id;
> + int rc = xen_wdt_stop();
> +
> + wdt.id = id;
> + return rc;
> }
>
> static int xen_wdt_resume(struct platform_device *dev)
> {
> + if (!wdt.id)
> + return 0;
> + wdt.id = 0;
> return xen_wdt_start();
> }
>
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
2012-03-21 17:23 ` Konrad Rzeszutek Wilk
@ 2012-03-21 19:07 ` Wim Van Sebroeck
-1 siblings, 0 replies; 6+ messages in thread
From: Wim Van Sebroeck @ 2012-03-21 19:07 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: Jan Beulich, Ian Campbell, Wouter de Geus, xen-devel,
linux-watchdog
Hi Konrad,
> On Mon, Mar 19, 2012 at 09:30:33AM +0000, Jan Beulich wrote:
> > This was found to be a problem particularly after guest migration.
> >
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
> > Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
> > Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
> > Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
>
> Looks good to me.
>
> Wim, would you like me to carry it for 3.4 or are you OK doing it?
I will carry both fixes in the watchdog tree.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume
@ 2012-03-21 19:07 ` Wim Van Sebroeck
0 siblings, 0 replies; 6+ messages in thread
From: Wim Van Sebroeck @ 2012-03-21 19:07 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk
Cc: linux-watchdog, Wouter de Geus, Ian Campbell, Jan Beulich,
xen-devel
Hi Konrad,
> On Mon, Mar 19, 2012 at 09:30:33AM +0000, Jan Beulich wrote:
> > This was found to be a problem particularly after guest migration.
> >
> > Signed-off-by: Jan Beulich <jbeulich@suse.com>
> > Reported-by: Wouter de Geus <benv-xensource.com@junerules.com>
> > Reported-by: Ian Campbell <Ian.Campbell@citrix.com>
> > Tested-by: Wouter de Geus <benv-xensource.com@junerules.com>
>
> Looks good to me.
>
> Wim, would you like me to carry it for 3.4 or are you OK doing it?
I will carry both fixes in the watchdog tree.
Kind regards,
Wim.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-03-21 19:07 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-19 9:30 [PATCH] watchdog/xen: don't unconditionally enable the watchdog during resume Jan Beulich
2012-03-19 9:30 ` Jan Beulich
2012-03-21 17:23 ` Konrad Rzeszutek Wilk
2012-03-21 17:23 ` Konrad Rzeszutek Wilk
2012-03-21 19:07 ` Wim Van Sebroeck
2012-03-21 19:07 ` Wim Van Sebroeck
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.