From 6f8a56edd841f18a8cd1e0918ee68199f6106c08 Mon Sep 17 00:00:00 2001
From: Arjan van de Ven <arjan@infradead.org>
Date: Sun, 13 Dec 2009 20:29:01 +0100
Subject: [PATCH] --- yaml --- r: 177377 b: refs/heads/master c:
 f2511774863487e61b56a97da07ebf8dd61d7836 h: refs/heads/master i:   177375:
 914754e8032cfe062dee60750d326b44752d002d v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/base/power/main.c | 31 +++++++++++++++++++++++++++++++
 trunk/include/linux/init.h      |  2 ++
 3 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 17aaf79a56da..d8573559edbd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1d531c14d2ed4b24472a4d773f00ed6d1cd34ee7
+refs/heads/master: f2511774863487e61b56a97da07ebf8dd61d7836
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
index 8aa2443182d5..30f0ceebd36c 100644
--- a/trunk/drivers/base/power/main.c
+++ b/trunk/drivers/base/power/main.c
@@ -25,6 +25,7 @@
 #include <linux/resume-trace.h>
 #include <linux/rwsem.h>
 #include <linux/interrupt.h>
+#include <linux/sched.h>
 
 #include "../base.h"
 #include "power.h"
@@ -172,6 +173,13 @@ static int pm_op(struct device *dev,
 		 pm_message_t state)
 {
 	int error = 0;
+	ktime_t calltime, delta, rettime;
+
+	if (initcall_debug) {
+		pr_info("calling  %s+ @ %i\n",
+				dev_name(dev), task_pid_nr(current));
+		calltime = ktime_get();
+	}
 
 	switch (state.event) {
 #ifdef CONFIG_SUSPEND
@@ -219,6 +227,14 @@ static int pm_op(struct device *dev,
 	default:
 		error = -EINVAL;
 	}
+
+	if (initcall_debug) {
+		rettime = ktime_get();
+		delta = ktime_sub(rettime, calltime);
+		pr_info("call %s+ returned %d after %Ld usecs\n", dev_name(dev),
+			error, (unsigned long long)ktime_to_ns(delta) >> 10);
+	}
+
 	return error;
 }
 
@@ -236,6 +252,13 @@ static int pm_noirq_op(struct device *dev,
 			pm_message_t state)
 {
 	int error = 0;
+	ktime_t calltime, delta, rettime;
+
+	if (initcall_debug) {
+		pr_info("calling  %s_i+ @ %i\n",
+				dev_name(dev), task_pid_nr(current));
+		calltime = ktime_get();
+	}
 
 	switch (state.event) {
 #ifdef CONFIG_SUSPEND
@@ -283,6 +306,14 @@ static int pm_noirq_op(struct device *dev,
 	default:
 		error = -EINVAL;
 	}
+
+	if (initcall_debug) {
+		rettime = ktime_get();
+		delta = ktime_sub(rettime, calltime);
+		printk("initcall %s_i+ returned %d after %Ld usecs\n", dev_name(dev),
+			error, (unsigned long long)ktime_to_ns(delta) >> 10);
+	}
+
 	return error;
 }
 
diff --git a/trunk/include/linux/init.h b/trunk/include/linux/init.h
index ff8bde520d03..ab1d31f9352b 100644
--- a/trunk/include/linux/init.h
+++ b/trunk/include/linux/init.h
@@ -149,6 +149,8 @@ void prepare_namespace(void);
 
 extern void (*late_time_init)(void);
 
+extern int initcall_debug;
+
 #endif
   
 #ifndef MODULE