diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 22:07:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 22:07:41 (GMT) |
| commit | 9a0bcc8fe701bb6e05e622c19b5815e949c9b7c5 (patch) | |
| tree | 23e19348c8ace918c48665510f5be2948ccb0138 /drivers/cpufreq/cpufreq-dt-platdev.c | |
| parent | 15301a570754c7af60335d094dd2d1808b0641a5 (diff) | |
| parent | b654c62e7734cdcd507a5751cd940077be2ad373 (diff) | |
| download | linux-9a0bcc8fe701bb6e05e622c19b5815e949c9b7c5.tar.xz | |
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
Diffstat (limited to 'drivers/cpufreq/cpufreq-dt-platdev.c')
| -rw-r--r-- | drivers/cpufreq/cpufreq-dt-platdev.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index 0bb44d5..2ee40fd 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c @@ -74,6 +74,8 @@ static const struct of_device_id machines[] __initconst = { { .compatible = "ti,omap5", }, { .compatible = "xlnx,zynq-7000", }, + + { } }; static int __init cpufreq_dt_platdev_init(void) |