Merge branches 'pm-sleep' and 'pm-cpufreq'

[karo-tx-linux.git] / kernel / power / process.c

diff --git a/kernel/power/process.c b/kernel/power/process.c
index 06ec8869dbf1629f2c7cabc63f2edc96426ea87d..4ee194eb524b3663dd39dfa7c22eb9565321853b 100644 (file)
--- a/kernel/power/process.c
+++ b/kernel/power/process.c
@@ -17,6 +17,7 @@
 #include <linux/delay.h>
 #include <linux/workqueue.h>
 #include <linux/kmod.h>
+#include <trace/events/power.h>
 
 /* 
  * Timeout for stopping processes
@@ -175,6 +176,7 @@ void thaw_processes(void)
        struct task_struct *g, *p;
        struct task_struct *curr = current;
 
+       trace_suspend_resume(TPS("thaw_processes"), 0, true);
        if (pm_freezing)
                atomic_dec(&system_freezing_cnt);
        pm_freezing = false;
@@ -184,6 +186,7 @@ void thaw_processes(void)
 
        printk("Restarting tasks ... ");
 
+       __usermodehelper_set_disable_depth(UMH_FREEZING);
        thaw_workqueues();
 
        read_lock(&tasklist_lock);
@@ -201,6 +204,7 @@ void thaw_processes(void)
 
        schedule();
        printk("done.\n");
+       trace_suspend_resume(TPS("thaw_processes"), 0, false);
 }
 
 void thaw_kernel_threads(void)