tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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

Pull power management fixes from Rafael Wysocki:
"This includes a stable-candidate cpufreq-dt driver problem fix and
annotations of tracepoints in the runtime PM framework.

Specifics:

- Fix the definition of the cpufreq-dt driver's machines table
introduced during the 4.7 cycle that should be NULL-terminated, but
the termination entry is missing from it (Wei Yongjun).

- Annotate tracepoints in the runtime PM framework's core so as to
allow the functions containing them to be called from the idle code
path without causing RCU to complain about illegal usage (Paul
McKenney)"

* tag 'pm-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / runtime: Add _rcuidle suffix to allow rpm_idle() use from idle
PM / runtime: Add _rcuidle suffix to allow rpm_resume() to be called from idle
cpufreq: dt: Add terminate entry for of_device_id tables

Linus Torvalds 9a0bcc8f 15301a57

+7 -5
+5 -5
drivers/base/power/runtime.c
··· 301 301 int (*callback)(struct device *); 302 302 int retval; 303 303 304 - trace_rpm_idle(dev, rpmflags); 304 + trace_rpm_idle_rcuidle(dev, rpmflags); 305 305 retval = rpm_check_suspend_allowed(dev); 306 306 if (retval < 0) 307 307 ; /* Conditions are wrong. */ ··· 337 337 dev->power.request_pending = true; 338 338 queue_work(pm_wq, &dev->power.work); 339 339 } 340 - trace_rpm_return_int(dev, _THIS_IP_, 0); 340 + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0); 341 341 return 0; 342 342 } 343 343 ··· 352 352 wake_up_all(&dev->power.wait_queue); 353 353 354 354 out: 355 - trace_rpm_return_int(dev, _THIS_IP_, retval); 355 + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); 356 356 return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); 357 357 } 358 358 ··· 601 601 struct device *parent = NULL; 602 602 int retval = 0; 603 603 604 - trace_rpm_resume(dev, rpmflags); 604 + trace_rpm_resume_rcuidle(dev, rpmflags); 605 605 606 606 repeat: 607 607 if (dev->power.runtime_error) ··· 764 764 spin_lock_irq(&dev->power.lock); 765 765 } 766 766 767 - trace_rpm_return_int(dev, _THIS_IP_, retval); 767 + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); 768 768 769 769 return retval; 770 770 }
+2
drivers/cpufreq/cpufreq-dt-platdev.c
··· 74 74 { .compatible = "ti,omap5", }, 75 75 76 76 { .compatible = "xlnx,zynq-7000", }, 77 + 78 + { } 77 79 }; 78 80 79 81 static int __init cpufreq_dt_platdev_init(void)