Merge branch 'pm-sleep'

* pm-sleep:
  PM / sleep: trace events for device PM callbacks
  PM / sleep: trace events for suspend/resume

diff --combined kernel/cpu.c
index 247979a1b815660b61100e5c9168ea85c690a4c7,76deba01322acae787dac032c4466c5fab8f313a..759feaaa9bb0704bd1ff44e072db25c78e4c5922
--- 1/kernel/cpu.c
--- 2/kernel/cpu.c
+++ b/kernel/cpu.c
@@@ -20,6 -20,7 +20,7 @@@
  #include <linux/gfp.h>
  #include <linux/suspend.h>
  #include <linux/lockdep.h>
+ #include <trace/events/power.h>
  
  #include "smpboot.h"
  
@@@ -522,7 -523,9 +523,9 @@@ int disable_nonboot_cpus(void
        for_each_online_cpu(cpu) {
                if (cpu == first_cpu)
                        continue;
+               trace_suspend_resume(TPS("CPU_OFF"), cpu, true);
                error = _cpu_down(cpu, 1);
+               trace_suspend_resume(TPS("CPU_OFF"), cpu, false);
                if (!error)
                        cpumask_set_cpu(cpu, frozen_cpus);
                else {
@@@ -566,7 -569,9 +569,9 @@@ void __ref enable_nonboot_cpus(void
        arch_enable_nonboot_cpus_begin();
  
        for_each_cpu(cpu, frozen_cpus) {
+               trace_suspend_resume(TPS("CPU_ON"), cpu, true);
                error = _cpu_up(cpu, 1);
+               trace_suspend_resume(TPS("CPU_ON"), cpu, false);
                if (!error) {
                        printk(KERN_INFO "CPU%d is up\n", cpu);
                        continue;
@@@ -726,12 -731,10 +731,12 @@@ void set_cpu_present(unsigned int cpu, 
  
  void set_cpu_online(unsigned int cpu, bool online)
  {
 -      if (online)
 +      if (online) {
                cpumask_set_cpu(cpu, to_cpumask(cpu_online_bits));
 -      else
 +              cpumask_set_cpu(cpu, to_cpumask(cpu_active_bits));
 +      } else {
                cpumask_clear_cpu(cpu, to_cpumask(cpu_online_bits));
 +      }
  }
  
  void set_cpu_active(unsigned int cpu, bool active)