From a7c5226ef4f7ab8e46b4b54a204c8f5368eab9c5 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 24 Jan 2013 11:01:32 -0800 Subject: [PATCH] --- yaml --- r: 350275 b: refs/heads/master c: e2905b29122173b72b612c962b138e3fa07476b8 h: refs/heads/master i: 350273: f6470ab0ead0ba86b3c544c55d99144db730f307 350271: 9a90fc1aa750382be45bb3672f66b7809e4fa447 v: v3 --- [refs] | 2 +- trunk/include/linux/workqueue.h | 1 - trunk/kernel/workqueue.c | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e261f3742430..04f307953505 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84b233adcca3cacd5cfa8013a5feda7a3db4a9af +refs/heads/master: e2905b29122173b72b612c962b138e3fa07476b8 diff --git a/trunk/include/linux/workqueue.h b/trunk/include/linux/workqueue.h index 2b58905d3504..ff68b1d95b41 100644 --- a/trunk/include/linux/workqueue.h +++ b/trunk/include/linux/workqueue.h @@ -426,7 +426,6 @@ extern bool cancel_delayed_work_sync(struct delayed_work *dwork); extern void workqueue_set_max_active(struct workqueue_struct *wq, int max_active); extern bool workqueue_congested(unsigned int cpu, struct workqueue_struct *wq); -extern unsigned int work_cpu(struct work_struct *work); extern unsigned int work_busy(struct work_struct *work); /* diff --git a/trunk/kernel/workqueue.c b/trunk/kernel/workqueue.c index 2ffa240052fa..fe0745f54fcd 100644 --- a/trunk/kernel/workqueue.c +++ b/trunk/kernel/workqueue.c @@ -449,6 +449,7 @@ static atomic_t unbound_pool_nr_running[NR_WORKER_POOLS] = { }; static int worker_thread(void *__worker); +static unsigned int work_cpu(struct work_struct *work); static int worker_pool_pri(struct worker_pool *pool) { @@ -3419,13 +3420,12 @@ EXPORT_SYMBOL_GPL(workqueue_congested); * RETURNS: * CPU number if @work was ever queued. WORK_CPU_NONE otherwise. */ -unsigned int work_cpu(struct work_struct *work) +static unsigned int work_cpu(struct work_struct *work) { struct global_cwq *gcwq = get_work_gcwq(work); return gcwq ? gcwq->cpu : WORK_CPU_NONE; } -EXPORT_SYMBOL_GPL(work_cpu); /** * work_busy - test whether a work is currently pending or running