git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
KVM: set_memory_region: Disallow changing read-only attribute later
[pandora-kernel.git]
/
kernel
/
workqueue.c
diff --git
a/kernel/workqueue.c
b/kernel/workqueue.c
index
1dae900
..
fbc6576
100644
(file)
--- a/
kernel/workqueue.c
+++ b/
kernel/workqueue.c
@@
-739,8
+739,10
@@
void wq_worker_waking_up(struct task_struct *task, unsigned int cpu)
{
struct worker *worker = kthread_data(task);
{
struct worker *worker = kthread_data(task);
- if (!(worker->flags & WORKER_NOT_RUNNING))
+ if (!(worker->flags & WORKER_NOT_RUNNING)) {
+ WARN_ON_ONCE(worker->pool->gcwq->cpu != cpu);
atomic_inc(get_pool_nr_running(worker->pool));
atomic_inc(get_pool_nr_running(worker->pool));
+ }
}
/**
}
/**
@@
-3485,7
+3487,7
@@
unsigned int work_busy(struct work_struct *work)
unsigned int ret = 0;
if (!gcwq)
unsigned int ret = 0;
if (!gcwq)
- return
false
;
+ return
0
;
spin_lock_irqsave(&gcwq->lock, flags);
spin_lock_irqsave(&gcwq->lock, flags);