mirror of https://gitee.com/openkylin/linux.git
Power management fix for v4.8-rc7
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). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAABCAAGBQJX3F6DAAoJEILEb/54YlRxb9oQAJtvdBwkB8bXC43NIPq5zy1k HSVObvrg+PtmI2gfQYgwdvYLiO2jtV0fk0e5+UeeLIBoZOCW30+ObR1zETeN3Kf/ UMAuPqzXBdxW2EJcePJq+y3vzu3bqWcbLpAhp//u7O11jnen6NfdxMUILkSRT2jQ uiJRIzimyxE/wkrPa5nHIm4+wGffX0vxJF/ex6OrQFMUcKFeGyX/RPhoFyZmh2oq ST0/gjFHCWzlYuAgQC9uqi6IYTnFth32pLJouuYWBxI9QTMNAf5VlyJDF4UrGVuu KmWa1vrKxc73xYIkHGTjog+dX9aCeZpPKsXW2wGWmF/rSMs6PYfdEaBrnPVyjwo/ aXmtVxd79jvzdcjhv5G2JYAM2uqNijbPTcMfMi8w6cxFS/ObXSLI+P42/2MyM7yj Ea235LFj3n7G9hwpnIZ8NwYAsB5VSe59Ot7+l/oe9qvcZxpIvhugVOS97m6/qWx1 5p17qX2wCrOirg2Sp22zZM0be3o9n/EJ2EV4BSgsLvTdWxg3Y3VLSVhPlhUhnz5Y dcHFN1O3cTiJkXL0kNcuqW+MEtm0iCWUBGKKU1Tux/2BAJcNE4rjA9ogaPV0t5ou zi5us/13ee8cO2yuCrfCLVZ/jZIVqWwtafe7rgx5KJ7HWR+Rhlc5PaEzYSGxGAvr bd/ljEmr+qaUksdPU4XM =ljAx -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
095f5cfaea
|
@ -419,7 +419,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
|
|||
struct device *parent = NULL;
|
||||
int retval;
|
||||
|
||||
trace_rpm_suspend(dev, rpmflags);
|
||||
trace_rpm_suspend_rcuidle(dev, rpmflags);
|
||||
|
||||
repeat:
|
||||
retval = rpm_check_suspend_allowed(dev);
|
||||
|
@ -549,7 +549,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
|
|||
}
|
||||
|
||||
out:
|
||||
trace_rpm_return_int(dev, _THIS_IP_, retval);
|
||||
trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval);
|
||||
|
||||
return retval;
|
||||
|
||||
|
|
Loading…
Reference in New Issue