mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-08-26 02:39:48 +00:00
Code Issues Releases Wiki Activity

[S390] improve suspend/resume error messages

Browse source 
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>
This commit is contained in:
Christian Borntraeger 2009-07-07 16:37:11 +02:00 committed by Martin Schwidefsky
parent fca3e357d5
commit 2c48c4d631
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/s390/block/dcssblk.c
View file

@ -964,7 +964,8 @@ static int dcssblk_freeze(struct device *dev)
break;
}
if (rc)
pr_err("Suspend failed because device %s is writeable.\n",
pr_err("Suspending the system failed because DCSS device %s "
"is writable\n",
dev_info->segment_name);
return rc;
}
@ -987,8 +988,8 @@ static int dcssblk_restore(struct device *dev)
goto out_panic;
}
if (start != entry->start || end != entry->end) {
pr_err("Mismatch of start / end address after "
"resuming device %s\n",
pr_err("The address range of DCSS %s changed "
"while the system was suspended\n",
entry->segment_name);
goto out_panic;
}

2
drivers/s390/block/xpram.c
View file

@ -443,7 +443,7 @@ static int xpram_validate_checksums(void)
*/
static void xpram_resume_error(const char *message)
{
pr_err("Resume error: %s\n", message);
pr_err("Resuming the system failed: %s\n", message);
panic("xpram resume error\n");
}

8
drivers/s390/char/vmwatchdog.c
View file

@ -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;