From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jun 2015 23:18:02 +0000 (+0200)
Subject: Merge branches 'pm-sleep' and 'pm-runtime'
X-Git-Tag: firefly_0821_release~176^2~1607^2~6
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=ab232ba57043ca85b55ffd7125f3f2c2d7e732ec;p=firefly-linux-kernel-4.4.55.git

Merge branches 'pm-sleep' and 'pm-runtime'

* pm-sleep:
  PM / sleep: trace_device_pm_callback coverage in dpm_prepare/complete
  PM / wakeup: add a dummy wakeup_source to record statistics
  PM / sleep: Make suspend-to-idle-specific code depend on CONFIG_SUSPEND
  PM / sleep: Return -EBUSY from suspend_enter() on wakeup detection
  PM / tick: Add tracepoints for suspend-to-idle diagnostics
  PM / sleep: Fix symbol name in a comment in kernel/power/main.c
  leds / PM: fix hibernation on arm when gpio-led used with CPU led trigger
  ARM: omap-device: use SET_NOIRQ_SYSTEM_SLEEP_PM_OPS
  bus: omap_l3_noc: add missed callbacks for suspend-to-disk
  PM / sleep: Add macro to define common noirq system PM callbacks
  PM / sleep: Refine diagnostic messages in enter_state()
  PM / wakeup: validate wakeup source before activating it.

* pm-runtime:
  PM / Runtime: Update last_busy in rpm_resume
  PM / runtime: add note about re-calling in during device probe()
---

ab232ba57043ca85b55ffd7125f3f2c2d7e732ec
diff --cc include/linux/cpuidle.h
index c7a63643658e,13ee266ca98c,9c5e89254796..d075d34279df
--- a/include/linux/cpuidle.h
+++ b/include/linux/cpuidle.h
@@@@ -196,14 -202,8 -196,10 +202,12 @@@@ static inline int cpuidle_find_deepest_
   static inline int cpuidle_enter_freeze(struct cpuidle_driver *drv,
   				       struct cpuidle_device *dev)
   {return -ENODEV; }
- -static inline struct cpuidle_driver *cpuidle_get_cpu_driver(
- -	struct cpuidle_device *dev) {return NULL; }
   #endif
   
 ++/* kernel/sched/idle.c */
 ++extern void sched_idle_set_state(struct cpuidle_state *idle_state);
 ++extern void default_idle_call(void);
 ++
   #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED
   void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a);
   #else