Commit 095f5cfa authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'pm-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

Pull power management fix from Rafael Wysocki:
 "More annotations of tracepoints in the runtime PM framework to prevent
  RCU from complaining when that code is invoked from the idle path
  (Paul McKenney)"

* tag 'pm-4.8-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / runtime: Use _rcuidle for runtime suspend tracepoints
parents dd5a477c 77893577
...@@ -419,7 +419,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) ...@@ -419,7 +419,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
struct device *parent = NULL; struct device *parent = NULL;
int retval; int retval;
trace_rpm_suspend(dev, rpmflags); trace_rpm_suspend_rcuidle(dev, rpmflags);
repeat: repeat:
retval = rpm_check_suspend_allowed(dev); retval = rpm_check_suspend_allowed(dev);
...@@ -549,7 +549,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) ...@@ -549,7 +549,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
} }
out: out:
trace_rpm_return_int(dev, _THIS_IP_, retval); trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
return retval; return retval;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment