diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
tree | db28291df94a2043af2123911984c5c173da4e6f /kernel/async.c | |
parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) |
Merge branch 'next' into for-linus
Diffstat (limited to 'kernel/async.c')
-rw-r--r-- | kernel/async.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/async.c b/kernel/async.c index d5fe7af0de2e..80b74b88fefe 100644 --- a/kernel/async.c +++ b/kernel/async.c | |||
@@ -51,7 +51,7 @@ asynchronous and synchronous parts of the kernel. | |||
51 | #include <linux/async.h> | 51 | #include <linux/async.h> |
52 | #include <linux/atomic.h> | 52 | #include <linux/atomic.h> |
53 | #include <linux/ktime.h> | 53 | #include <linux/ktime.h> |
54 | #include <linux/module.h> | 54 | #include <linux/export.h> |
55 | #include <linux/wait.h> | 55 | #include <linux/wait.h> |
56 | #include <linux/sched.h> | 56 | #include <linux/sched.h> |
57 | #include <linux/slab.h> | 57 | #include <linux/slab.h> |
@@ -120,7 +120,7 @@ static void async_run_entry_fn(struct work_struct *work) | |||
120 | struct async_entry *entry = | 120 | struct async_entry *entry = |
121 | container_of(work, struct async_entry, work); | 121 | container_of(work, struct async_entry, work); |
122 | unsigned long flags; | 122 | unsigned long flags; |
123 | ktime_t calltime, delta, rettime; | 123 | ktime_t uninitialized_var(calltime), delta, rettime; |
124 | 124 | ||
125 | /* 1) move self to the running queue */ | 125 | /* 1) move self to the running queue */ |
126 | spin_lock_irqsave(&async_lock, flags); | 126 | spin_lock_irqsave(&async_lock, flags); |
@@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full_domain); | |||
269 | void async_synchronize_cookie_domain(async_cookie_t cookie, | 269 | void async_synchronize_cookie_domain(async_cookie_t cookie, |
270 | struct list_head *running) | 270 | struct list_head *running) |
271 | { | 271 | { |
272 | ktime_t starttime, delta, endtime; | 272 | ktime_t uninitialized_var(starttime), delta, endtime; |
273 | 273 | ||
274 | if (initcall_debug && system_state == SYSTEM_BOOTING) { | 274 | if (initcall_debug && system_state == SYSTEM_BOOTING) { |
275 | printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current)); | 275 | printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current)); |