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

Commit 04bf7539 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Linus Torvalds
Browse files

PM: Make warning in suspend_test_finish() less likely to happen 



Increase TEST_SUSPEND_SECONDS to 10 so the warning in
suspend_test_finish() doesn't annoy the users of slower systems so much.

Also, make the warning print the suspend-resume cycle time, so that we
know why the warning actually triggered.

Patch prepared during the hacking session at the Kernel Summit in Tokyo.

Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent af2bd9d5

kernel/power/suspend_test.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
 * The time it takes is system-specific though, so when we test this

 * The time it takes is system-specific though, so when we test this

 * during system bootup we allow a LOT of time.

 * during system bootup we allow a LOT of time.

 */

 */

#define TEST_SUSPEND_SECONDS	5

#define TEST_SUSPEND_SECONDS	10





static unsigned long suspend_test_start_time;

static unsigned long suspend_test_start_time;
@@ -49,7 +49,8 @@ void suspend_test_finish(const char *label) 
	 * has some performance issues.  The stack dump of a WARN_ON

	 * has some performance issues.  The stack dump of a WARN_ON

	 * is more likely to get the right attention than a printk...

	 * is more likely to get the right attention than a printk...

	 */

	 */

	WARN(msec > (TEST_SUSPEND_SECONDS * 1000), "Component: %s\n", label);

	WARN(msec > (TEST_SUSPEND_SECONDS * 1000),

	     "Component: %s, time: %u\n", label, msec);

}

}





/*

/*