4 files changed, 11 insertions, 9 deletions

diff --git a/arch/x86/kernel/apic/vector.c b/arch/x86/kernel/apic/vector.c
index 26d3ccc63e40..a5e400afc563 100644
--- a/arch/x86/kernel/apic/vector.c
+++ b/arch/x86/kernel/apic/vector.c
@@ -256,7 +256,8 @@ static void clear_irq_vector(int irq, struct apic_chip_data *data)
         struct irq_desc *desc;
         int cpu, vector;
 
-        BUG_ON(!data->cfg.vector);
+        if (!data->cfg.vector)
+                return;
 
         vector = data->cfg.vector;
         for_each_cpu_and(cpu, data->domain, cpu_online_mask)
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 6770865fde6b..6f8902b0d151 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -389,12 +389,6 @@ default_entry:
         /* Make changes effective */
         wrmsr
 
-        /*
-         * And make sure that all the mappings we set up have NX set from
-         * the beginning.
-         */
-        orl $(1 << (_PAGE_BIT_NX - 32)), pa(__supported_pte_mask + 4)
-
 enable_paging:
 
 /*
diff --git a/arch/x86/mm/setup_nx.c b/arch/x86/mm/setup_nx.c
index 8bea84724a7d..f65a33f505b6 100644
--- a/arch/x86/mm/setup_nx.c
+++ b/arch/x86/mm/setup_nx.c
@@ -32,8 +32,9 @@ early_param("noexec", noexec_setup);
 
 void x86_configure_nx(void)
 {
-        /* If disable_nx is set, clear NX on all new mappings going forward. */
-        if (disable_nx)
+        if (boot_cpu_has(X86_FEATURE_NX) && !disable_nx)
+                __supported_pte_mask |= _PAGE_NX;
+        else
                 __supported_pte_mask &= ~_PAGE_NX;
 }
 
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c
index 9e2ba5c6e1dd..f42e78de1e10 100644
--- a/arch/x86/xen/spinlock.c
+++ b/arch/x86/xen/spinlock.c
@@ -27,6 +27,12 @@ static bool xen_pvspin = true;
 
 static void xen_qlock_kick(int cpu)
 {
+        int irq = per_cpu(lock_kicker_irq, cpu);
+
+        /* Don't kick if the target's kicker interrupt is not initialized. */
+        if (irq == -1)
+                return;
+
         xen_send_IPI_one(cpu, XEN_SPIN_UNLOCK_VECTOR);
 }