hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[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>
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; break;
} }
if (rc) 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); dev_info->segment_name);
return rc; return rc;
} }
@ -987,8 +988,8 @@ static int dcssblk_restore(struct device *dev)
goto out_panic; goto out_panic;
} }
if (start != entry->start || end != entry->end) { if (start != entry->start || end != entry->end) {
pr_err("Mismatch of start / end address after " pr_err("The address range of DCSS %s changed "
"resuming device %s\n", "while the system was suspended\n",
entry->segment_name); entry->segment_name);
goto out_panic; goto out_panic;
} }

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

@ -443,7 +443,7 @@ fail:
*/ */
static void xpram_resume_error(const char *message) 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"); 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) static int vmwdt_suspend(void)
{ {
if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) { if (test_and_set_bit(VMWDT_OPEN, &vmwdt_is_open)) {
pr_err("The watchdog is in use. " pr_err("The system cannot be suspended while the watchdog"
"This prevents hibernation or suspend.\n"); " is in use\n");
return NOTIFY_BAD; return NOTIFY_BAD;
} }
if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) { if (test_bit(VMWDT_RUNNING, &vmwdt_is_open)) {
clear_bit(VMWDT_OPEN, &vmwdt_is_open); clear_bit(VMWDT_OPEN, &vmwdt_is_open);
pr_err("The watchdog is running. " pr_err("The system cannot be suspended while the watchdog"
"This prevents hibernation or suspend.\n"); " is running\n");
return NOTIFY_BAD; return NOTIFY_BAD;
} }
return NOTIFY_DONE; return NOTIFY_DONE;