Merge branch 'linus' into sched/urgent

Conflicts:
	kernel/sched_idletask.c

Merge reason: resolve the conflicts, pick up latest changes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 2 deletions

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 4b89b791be6a..42be0b15084b 100644
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -826,8 +826,7 @@ static void __cpuinit take_over_work(struct ehca_comp_pool *pool, int cpu)
                 cq = list_entry(cct->cq_list.next, struct ehca_cq, entry);
 
                 list_del(&cq->entry);
-                __queue_comp_task(cq, per_cpu_ptr(pool->cpu_comp_tasks,
-                                                  smp_processor_id()));
+                __queue_comp_task(cq, this_cpu_ptr(pool->cpu_comp_tasks));
         }
 
         spin_unlock_irqrestore(&cct->task_lock, flags_cct);