Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c48c4d6 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Martin Schwidefsky
Browse files

[S390] improve suspend/resume error messages 



From: Michael Holzheu <holzheu@linux.vnet.ibm.com>

Signed-off-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent fca3e357

drivers/s390/block/dcssblk.c

+4 −3
Original line number Diff line number Diff line
@@ -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;

			}

drivers/s390/block/xpram.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

}

drivers/s390/char/vmwatchdog.c

+4 −4
Original line number Diff line number Diff line
@@ -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;