* [PATCH 3/3] workqueue: cleanup workqueue.c to make checkpatch happy
@ 2009-01-22 9:14 Lai Jiangshan
0 siblings, 0 replies; only message in thread
From: Lai Jiangshan @ 2009-01-22 9:14 UTC (permalink / raw)
To: Oleg Nesterov, Ingo Molnar, Andrew Morton, Peter Zijlstra,
Eric Dumazet, Frédéric Weisbecker,
Linux Kernel Mailing List
Warnings and errors from checkpatch's output are correct,
this patch fix them.
Only except this incorrect one:
WARNING: use of in_atomic() is incorrect outside core kernel code
#295: FILE: kernel/workqueue.c:292:
+ if (unlikely(in_atomic() || lockdep_depth(current) > 0)) {
Signed-off-by: Lai Jiangshan <laijs@cn.fujitsu.com>
---
diff --git a/kernel/workqueue.c b/kernel/workqueue.c
index 6cf7785..1d2f06f 100644
--- a/kernel/workqueue.c
+++ b/kernel/workqueue.c
@@ -120,7 +120,8 @@ static inline void set_wq_data(struct work_struct *work,
static inline
struct cpu_workqueue_struct *get_wq_data(struct work_struct *work)
{
- return (void *) (atomic_long_read(&work->data) & WORK_STRUCT_WQ_DATA_MASK);
+ return (void *)(atomic_long_read(&work->data)
+ & WORK_STRUCT_WQ_DATA_MASK);
}
static void insert_work(struct cpu_workqueue_struct *cwq,
@@ -292,7 +293,7 @@ static void run_workqueue(struct cpu_workqueue_struct *cwq)
printk(KERN_ERR "BUG: workqueue leaked lock or atomic: "
"%s/0x%08x/%d\n",
current->comm, preempt_count(),
- task_pid_nr(current));
+ task_pid_nr(current));
printk(KERN_ERR " last function: ");
print_symbol("%s\n", (unsigned long)f);
debug_show_held_locks(current);
@@ -533,7 +534,7 @@ static void wait_on_work(struct work_struct *work)
}
static int __cancel_work_timer(struct work_struct *work,
- struct timer_list* timer)
+ struct timer_list *timer)
{
int ret;
@@ -905,7 +906,7 @@ void destroy_workqueue(struct workqueue_struct *wq)
for_each_cpu_mask_nr(cpu, *cpu_map)
cleanup_workqueue_thread(per_cpu_ptr(wq->cpu_wq, cpu));
- cpu_maps_update_done();
+ cpu_maps_update_done();
free_percpu(wq->cpu_wq);
kfree(wq);
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2009-01-22 9:15 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-01-22 9:14 [PATCH 3/3] workqueue: cleanup workqueue.c to make checkpatch happy Lai Jiangshan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox