aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2009-01-07 12:28:53 -0500
committerArjan van de Ven <arjan@linux.intel.com>2009-01-07 12:31:49 -0500
commitad160d23198193135cb2bcc75222e0816b5838c0 (patch)
treeba7cc0e98494d63a02b10ab22f896e07efa6f509 /kernel
parent24b0ecad07ac4d7ef74cb6f7da08c449fa9f6a4f (diff)
async: don't do the initcall stuff post boot
while tracking the asynchronous calls during boot using the initcall_debug convention is useful, doing it once the kernel is done is actually bad now that we use asynchronous operations post boot as well... Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/async.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/async.c b/kernel/async.c
index afaa8a653d5a..97373380c9e7 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -124,12 +124,12 @@ static void run_one_entry(void)
124 spin_unlock_irqrestore(&async_lock, flags); 124 spin_unlock_irqrestore(&async_lock, flags);
125 125
126 /* 3) run it (and print duration)*/ 126 /* 3) run it (and print duration)*/
127 if (initcall_debug) { 127 if (initcall_debug && system_state == SYSTEM_BOOTING) {
128 printk("calling %lli_%pF @ %i\n", entry->cookie, entry->func, task_pid_nr(current)); 128 printk("calling %lli_%pF @ %i\n", entry->cookie, entry->func, task_pid_nr(current));
129 calltime = ktime_get(); 129 calltime = ktime_get();
130 } 130 }
131 entry->func(entry->data, entry->cookie); 131 entry->func(entry->data, entry->cookie);
132 if (initcall_debug) { 132 if (initcall_debug && system_state == SYSTEM_BOOTING) {
133 rettime = ktime_get(); 133 rettime = ktime_get();
134 delta = ktime_sub(rettime, calltime); 134 delta = ktime_sub(rettime, calltime);
135 printk("initcall %lli_%pF returned 0 after %lld usecs\n", entry->cookie, 135 printk("initcall %lli_%pF returned 0 after %lld usecs\n", entry->cookie,
@@ -220,14 +220,14 @@ void async_synchronize_cookie_special(async_cookie_t cookie, struct list_head *r
220{ 220{
221 ktime_t starttime, delta, endtime; 221 ktime_t starttime, delta, endtime;
222 222
223 if (initcall_debug) { 223 if (initcall_debug && system_state == SYSTEM_BOOTING) {
224 printk("async_waiting @ %i\n", task_pid_nr(current)); 224 printk("async_waiting @ %i\n", task_pid_nr(current));
225 starttime = ktime_get(); 225 starttime = ktime_get();
226 } 226 }
227 227
228 wait_event(async_done, __lowest_in_progress(running) >= cookie); 228 wait_event(async_done, __lowest_in_progress(running) >= cookie);
229 229
230 if (initcall_debug) { 230 if (initcall_debug && system_state == SYSTEM_BOOTING) {
231 endtime = ktime_get(); 231 endtime = ktime_get();
232 delta = ktime_sub(endtime, starttime); 232 delta = ktime_sub(endtime, starttime);
233 233