Skip to content

Commit

Permalink
IB/ehca: Make scaling code work without CPU hotplug
Browse files Browse the repository at this point in the history
eHCA scaling code must not depend on register_cpu_notifier() if
CONFIG_HOTPLUG_CPU is not set, so put all related code into #ifdefs.

Signed-off-by: Joachim Fenkes <[email protected]>
Signed-off-by: Roland Dreier <[email protected]>
  • Loading branch information
fenkes-ibm authored and Roland Dreier committed Mar 22, 2007
1 parent d601347 commit 73b9e98
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions drivers/infiniband/hw/ehca/ehca_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@
static void queue_comp_task(struct ehca_cq *__cq);

static struct ehca_comp_pool* pool;
#ifdef CONFIG_HOTPLUG_CPU
static struct notifier_block comp_pool_callback_nb;
#endif

static inline void comp_event_callback(struct ehca_cq *cq)
{
Expand Down Expand Up @@ -733,6 +735,7 @@ static void take_over_work(struct ehca_comp_pool *pool,

}

#ifdef CONFIG_HOTPLUG_CPU
static int comp_pool_callback(struct notifier_block *nfb,
unsigned long action,
void *hcpu)
Expand Down Expand Up @@ -775,6 +778,7 @@ static int comp_pool_callback(struct notifier_block *nfb,

return NOTIFY_OK;
}
#endif

int ehca_create_comp_pool(void)
{
Expand Down Expand Up @@ -805,9 +809,11 @@ int ehca_create_comp_pool(void)
}
}

#ifdef CONFIG_HOTPLUG_CPU
comp_pool_callback_nb.notifier_call = comp_pool_callback;
comp_pool_callback_nb.priority =0;
register_cpu_notifier(&comp_pool_callback_nb);
#endif

printk(KERN_INFO "eHCA scaling code enabled\n");

Expand All @@ -821,7 +827,9 @@ void ehca_destroy_comp_pool(void)
if (!ehca_scaling_code)
return;

#ifdef CONFIG_HOTPLUG_CPU
unregister_cpu_notifier(&comp_pool_callback_nb);
#endif

for (i = 0; i < NR_CPUS; i++) {
if (cpu_online(i))
Expand Down

0 comments on commit 73b9e98

Please sign in to comment.