At this stage of system shutdown procedure the jiffies may not be updated anymore, so have to base on raw sched_clock values.
Signed-off-by: Pawel Moll <[email protected]> Cc: Anton Vorontsov <[email protected]> Cc: David Woodhouse <[email protected]> --- drivers/power/reset/vexpress-poweroff.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/power/reset/vexpress-poweroff.c b/drivers/power/reset/vexpress-poweroff.c index 476aa49..d752233 100644 --- a/drivers/power/reset/vexpress-poweroff.c +++ b/drivers/power/reset/vexpress-poweroff.c @@ -15,6 +15,7 @@ #include <linux/of.h> #include <linux/of_device.h> #include <linux/platform_device.h> +#include <linux/sched.h> #include <linux/stat.h> #include <linux/vexpress.h> @@ -27,12 +28,12 @@ static void vexpress_reset_do(struct device *dev, const char *what) vexpress_config_func_get_by_dev(dev); if (func) { - unsigned long timeout; + unsigned long long timeout_ns; err = vexpress_config_write(func, 0, 0); - timeout = jiffies + HZ; - while (time_before(jiffies, timeout)) + timeout_ns = sched_clock() + 50000000; + while (!err && time_before64(sched_clock(), timeout_ns)) cpu_relax(); } -- 1.8.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
