diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2009-07-07 16:37:11 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2009-07-07 16:37:53 +0200 |
| commit | 2c48c4d631970b70d60a4f926b0f68f194a0d559 (patch) | |
| tree | 841ccd09108a4f9707f1b5fb0464627d061adfda /drivers/s390/char/vmwatchdog.c | |
| parent | [S390] set SCHED_OMIT_FRAME_POINTER for s390 (diff) | |
| download | linux-2c48c4d631970b70d60a4f926b0f68f194a0d559.tar.xz linux-2c48c4d631970b70d60a4f926b0f68f194a0d559.zip | |
[S390] improve suspend/resume error messages
From: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'drivers/s390/char/vmwatchdog.c')
| -rw-r--r-- | drivers/s390/char/vmwatchdog.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/s390/char/vmwatchdog.c b/drivers/s390/char/vmwatchdog.c index cb7854c10c04..f2bc287b69e4 100644 --- a/drivers/s390/char/vmwatchdog.c +++ b/drivers/s390/char/vmwatchdog.c @@ -250,14 +250,14 @@ static int vmwdt_resume(void) static int vmwdt_suspend(void) { if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { - pr_err("The watchdog is in use. " - "This prevents hibernation or suspend.\n"); + pr_err("The system cannot be suspended while the watchdog" + " is in use\n"); return NOTIFY_BAD; } if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { clear_bit(VMWDT_OPEN, &vmwdt_is_open); - pr_err("The watchdog is running. " - "This prevents hibernation or suspend.\n"); + pr_err("The system cannot be suspended while the watchdog" + " is running\n"); return NOTIFY_BAD; } return NOTIFY_DONE; |