Merge tag 'docs-5.16-3' of git://git.lwn.net/linux

[linux-2.6-microblaze.git] / arch / x86 / xen / smp.c

diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c
index c1b2f76..c3e1f9a 100644 (file)
--- a/arch/x86/xen/smp.c
+++ b/arch/x86/xen/smp.c
@@ -121,34 +121,10 @@ int xen_smp_intr_init(unsigned int cpu)
 
 void __init xen_smp_cpus_done(unsigned int max_cpus)
 {
-       int cpu, rc, count = 0;
-
        if (xen_hvm_domain())
                native_smp_cpus_done(max_cpus);
        else
                calculate_max_logical_packages();
-
-       if (xen_have_vcpu_info_placement)
-               return;
-
-       for_each_online_cpu(cpu) {
-               if (xen_vcpu_nr(cpu) < MAX_VIRT_CPUS)
-                       continue;
-
-               rc = remove_cpu(cpu);
-
-               if (rc == 0) {
-                       /*
-                        * Reset vcpu_info so this cpu cannot be onlined again.
-                        */
-                       xen_vcpu_info_reset(cpu);
-                       count++;
-               } else {
-                       pr_warn("%s: failed to bring CPU %d down, error %d\n",
-                               __func__, cpu, rc);
-               }
-       }
-       WARN(count, "%s: brought %d CPUs offline\n", __func__, count);
 }
 
 void xen_smp_send_reschedule(int cpu)
@@ -268,20 +244,16 @@ void xen_send_IPI_allbutself(int vector)
 
 static irqreturn_t xen_call_function_interrupt(int irq, void *dev_id)
 {
-       irq_enter();
        generic_smp_call_function_interrupt();
        inc_irq_stat(irq_call_count);
-       irq_exit();
 
        return IRQ_HANDLED;
 }
 
 static irqreturn_t xen_call_function_single_interrupt(int irq, void *dev_id)
 {
-       irq_enter();
        generic_smp_call_function_single_interrupt();
        inc_irq_stat(irq_call_count);
-       irq_exit();
 
        return IRQ_HANDLED;
 }