lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

infiniband: ehca: Fix compiler warnings

Browse Source 
Fix comp_task() to return void to match smp_hotplug_thread's thread_fn
member, and adjust indirection on the ->cpu_comp_threads per-CPU
member of the ehca_comp_pool structure.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul E. McKenney <paul.mckenney@linaro.org>
Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Tested-by: Stephen Rothwell <sfr@canb.auug.org.au>
This commit is contained in:
Paul E. McKenney
2012-08-17 04:43:11 -07:00
committed by Paul E. McKenney
parent c0e12e51b0
commit bff4a39479
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/infiniband/hw/ehca/ehca_irq.c
View File

@@ -707,7 +707,7 @@ static void queue_comp_task(struct ehca_cq *__cq)
BUG_ON(!cpu_online(cpu_id)); BUG_ON(!cpu_online(cpu_id));
cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id); cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu_id); thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
BUG_ON(!cct || !thread); BUG_ON(!cct || !thread);
spin_lock_irqsave(&cct->task_lock, flags); spin_lock_irqsave(&cct->task_lock, flags);
@@ -716,7 +716,7 @@ static void queue_comp_task(struct ehca_cq *__cq)
if (cq_jobs > 0) { if (cq_jobs > 0) {
cpu_id = find_next_online_cpu(pool); cpu_id = find_next_online_cpu(pool);
cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id); cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu_id);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu_id); thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu_id);
BUG_ON(!cct || !thread); BUG_ON(!cct || !thread);
} }
__queue_comp_task(__cq, cct, thread); __queue_comp_task(__cq, cct, thread);
@@ -761,7 +761,7 @@ static void comp_task_park(unsigned int cpu)
cpu = find_next_online_cpu(pool); cpu = find_next_online_cpu(pool);
target = per_cpu_ptr(pool->cpu_comp_tasks, cpu); target = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
thread = per_cpu_ptr(pool->cpu_comp_threads, cpu); thread = *per_cpu_ptr(pool->cpu_comp_threads, cpu);
spin_lock_irq(&target->task_lock); spin_lock_irq(&target->task_lock);
list_for_each_entry_safe(cq, tmp, &list, entry) { list_for_each_entry_safe(cq, tmp, &list, entry) {
list_del(&cq->entry); list_del(&cq->entry);
@@ -788,7 +788,7 @@ static int comp_task_should_run(unsigned int cpu)
return cct->cq_jobs; return cct->cq_jobs;
} }
static int comp_task(unsigned int cpu) static void comp_task(unsigned int cpu)
{ {
struct ehca_cpu_comp_task *cct = this_cpu_ptr(pool->cpu_comp_tasks); struct ehca_cpu_comp_task *cct = this_cpu_ptr(pool->cpu_comp_tasks);
int cql_empty; int cql_empty;