|
@@ -432,12 +432,12 @@ static int xen_evtchn_cpu_dead(unsigned int cpu)
|
|
|
|
|
|
int __init xen_evtchn_fifo_init(void)
|
|
int __init xen_evtchn_fifo_init(void)
|
|
{
|
|
{
|
|
- int cpu = get_cpu();
|
|
|
|
|
|
+ int cpu = smp_processor_id();
|
|
int ret;
|
|
int ret;
|
|
|
|
|
|
ret = evtchn_fifo_alloc_control_block(cpu);
|
|
ret = evtchn_fifo_alloc_control_block(cpu);
|
|
if (ret < 0)
|
|
if (ret < 0)
|
|
- goto out;
|
|
|
|
|
|
+ return ret;
|
|
|
|
|
|
pr_info("Using FIFO-based ABI\n");
|
|
pr_info("Using FIFO-based ABI\n");
|
|
|
|
|
|
@@ -446,7 +446,6 @@ int __init xen_evtchn_fifo_init(void)
|
|
cpuhp_setup_state_nocalls(CPUHP_XEN_EVTCHN_PREPARE,
|
|
cpuhp_setup_state_nocalls(CPUHP_XEN_EVTCHN_PREPARE,
|
|
"xen/evtchn:prepare",
|
|
"xen/evtchn:prepare",
|
|
xen_evtchn_cpu_prepare, xen_evtchn_cpu_dead);
|
|
xen_evtchn_cpu_prepare, xen_evtchn_cpu_dead);
|
|
-out:
|
|
|
|
- put_cpu();
|
|
|
|
|
|
+
|
|
return ret;
|
|
return ret;
|
|
}
|
|
}
|