diff --git a/[refs] b/[refs] index 41ac038e61cf..9f1c5ee230f0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: af2bd9d534ca9f1ffdeb0780fb8508e71ed55803 +refs/heads/master: 04bf7539c08d64184736cdc5e4ad617eda77eb0f diff --git a/trunk/kernel/power/suspend_test.c b/trunk/kernel/power/suspend_test.c index 17d8bb1acf9c..25596e450ac7 100644 --- a/trunk/kernel/power/suspend_test.c +++ b/trunk/kernel/power/suspend_test.c @@ -19,7 +19,7 @@ * The time it takes is system-specific though, so when we test this * 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; @@ -49,7 +49,8 @@ void suspend_test_finish(const char *label) * has some performance issues. The stack dump of a WARN_ON * 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); } /*