Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-omap-h63xx.git] / drivers / infiniband / hw / ehca / ehca_irq.c

diff --git a/drivers/infiniband/hw/ehca/ehca_irq.c b/drivers/infiniband/hw/ehca/ehca_irq.c
index 757035ea246faff58225747668d38a53f5362e59..99bcbd7ffb0a3faf5ebe9281adbf297e67cbd491 100644 (file)
--- a/drivers/infiniband/hw/ehca/ehca_irq.c
+++ b/drivers/infiniband/hw/ehca/ehca_irq.c
@@ -99,7 +99,7 @@ static void print_error_data(struct ehca_shca *shca, void *data,
                        return;
 
                ehca_err(&shca->ib_device,
-                        "QP 0x%x (resource=%lx) has errors.",
+                        "QP 0x%x (resource=%llx) has errors.",
                         qp->ib_qp.qp_num, resource);
                break;
        }
@@ -108,21 +108,21 @@ static void print_error_data(struct ehca_shca *shca, void *data,
                struct ehca_cq *cq = (struct ehca_cq *)data;
 
                ehca_err(&shca->ib_device,
-                        "CQ 0x%x (resource=%lx) has errors.",
+                        "CQ 0x%x (resource=%llx) has errors.",
                         cq->cq_number, resource);
                break;
        }
        default:
                ehca_err(&shca->ib_device,
-                        "Unknown error type: %lx on %s.",
+                        "Unknown error type: %llx on %s.",
                         type, shca->ib_device.name);
                break;
        }
 
-       ehca_err(&shca->ib_device, "Error data is available: %lx.", resource);
+       ehca_err(&shca->ib_device, "Error data is available: %llx.", resource);
        ehca_err(&shca->ib_device, "EHCA ----- error data begin "
                 "---------------------------------------------------");
-       ehca_dmp(rblock, length, "resource=%lx", resource);
+       ehca_dmp(rblock, length, "resource=%llx", resource);
        ehca_err(&shca->ib_device, "EHCA ----- error data end "
                 "----------------------------------------------------");
 
@@ -152,7 +152,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data,
 
        if (ret == H_R_STATE)
                ehca_err(&shca->ib_device,
-                        "No error data is available: %lx.", resource);
+                        "No error data is available: %llx.", resource);
        else if (ret == H_SUCCESS) {
                int length;
 
@@ -164,7 +164,7 @@ int ehca_error_data(struct ehca_shca *shca, void *data,
                print_error_data(shca, data, rblock, length);
        } else
                ehca_err(&shca->ib_device,
-                        "Error data could not be fetched: %lx", resource);
+                        "Error data could not be fetched: %llx", resource);
 
        ehca_free_fw_ctrlblock(rblock);
 
@@ -514,7 +514,7 @@ static inline void process_eqe(struct ehca_shca *shca, struct ehca_eqe *eqe)
        struct ehca_cq *cq;
 
        eqe_value = eqe->entry;
-       ehca_dbg(&shca->ib_device, "eqe_value=%lx", eqe_value);
+       ehca_dbg(&shca->ib_device, "eqe_value=%llx", eqe_value);
        if (EHCA_BMASK_GET(EQE_COMPLETION_EVENT, eqe_value)) {
                ehca_dbg(&shca->ib_device, "Got completion event");
                token = EHCA_BMASK_GET(EQE_CQ_TOKEN, eqe_value);
@@ -603,7 +603,7 @@ void ehca_process_eq(struct ehca_shca *shca, int is_irq)
                ret = hipz_h_eoi(eq->ist);
                if (ret != H_SUCCESS)
                        ehca_err(&shca->ib_device,
-                                "bad return code EOI -rc = %ld\n", ret);
+                                "bad return code EOI -rc = %lld\n", ret);
                ehca_dbg(&shca->ib_device, "deadman found %x eqe", eqe_cnt);
        }
        if (unlikely(eqe_cnt == EHCA_EQE_CACHE_SIZE))
@@ -659,12 +659,12 @@ static inline int find_next_online_cpu(struct ehca_comp_pool *pool)
 
        WARN_ON_ONCE(!in_interrupt());
        if (ehca_debug_level >= 3)
-               ehca_dmp(&cpu_online_map, sizeof(cpumask_t), "");
+               ehca_dmp(cpu_online_mask, cpumask_size(), "");
 
        spin_lock_irqsave(&pool->last_cpu_lock, flags);
-       cpu = next_cpu_nr(pool->last_cpu, cpu_online_map);
+       cpu = cpumask_next(pool->last_cpu, cpu_online_mask);
        if (cpu >= nr_cpu_ids)
-               cpu = first_cpu(cpu_online_map);
+               cpu = cpumask_first(cpu_online_mask);
        pool->last_cpu = cpu;
        spin_unlock_irqrestore(&pool->last_cpu_lock, flags);
 
@@ -855,7 +855,7 @@ static int __cpuinit comp_pool_callback(struct notifier_block *nfb,
        case CPU_UP_CANCELED_FROZEN:
                ehca_gen_dbg("CPU: %x (CPU_CANCELED)", cpu);
                cct = per_cpu_ptr(pool->cpu_comp_tasks, cpu);
-               kthread_bind(cct->task, any_online_cpu(cpu_online_map));
+               kthread_bind(cct->task, cpumask_any(cpu_online_mask));
                destroy_comp_task(pool, cpu);
                break;
        case CPU_ONLINE:
@@ -902,7 +902,7 @@ int ehca_create_comp_pool(void)
                return -ENOMEM;
 
        spin_lock_init(&pool->last_cpu_lock);
-       pool->last_cpu = any_online_cpu(cpu_online_map);
+       pool->last_cpu = cpumask_any(cpu_online_mask);
 
        pool->cpu_comp_tasks = alloc_percpu(struct ehca_cpu_comp_task);
        if (pool->cpu_comp_tasks == NULL) {
@@ -934,10 +934,9 @@ void ehca_destroy_comp_pool(void)
 
        unregister_hotcpu_notifier(&comp_pool_callback_nb);
 
-       for (i = 0; i < NR_CPUS; i++) {
-               if (cpu_online(i))
-                       destroy_comp_task(pool, i);
-       }
+       for_each_online_cpu(i)
+               destroy_comp_task(pool, i);
+
        free_percpu(pool->cpu_comp_tasks);
        kfree(pool);
 }