[GIT PULL] IRQ fixes

[Ingo Molnar <mingo@kernel.org>]

Linus,

Please pull the latest irq-urgent-for-linus git tree from:

   git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq-urgent-for-linus

   # HEAD: d97eb8966c91f2c9d05f0a22eb89ed5b76d966d1 x86/irq: Check for valid irq descriptor in check_irq_vectors_for_cpu_disable()

Two x86 irq related fixes: a hotplug crash fix and an ACPI 
IRQ registry fix.

 Thanks,

	Ingo

------------------>
Jiang Liu (1):
      x86/irq: Fix regression caused by commit b568b8601f05

Joerg Roedel (1):
      x86/irq: Check for valid irq descriptor in check_irq_vectors_for_cpu_disable()


 arch/x86/kernel/acpi/boot.c | 5 +++++
 arch/x86/kernel/irq.c       | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index a18fff361c7f..8b5916342902 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -613,6 +613,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
 {
 	int rc, irq, trigger, polarity;
 
+	if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
+		*irqp = gsi;
+		return 0;
+	}
+
 	rc = acpi_get_override_irq(gsi, &trigger, &polarity);
 	if (rc == 0) {
 		trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 705ef8d48e2d..67b1cbe0093a 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -302,6 +302,9 @@ int check_irq_vectors_for_cpu_disable(void)
 		irq = __this_cpu_read(vector_irq[vector]);
 		if (irq >= 0) {
 			desc = irq_to_desc(irq);
+			if (!desc)
+				continue;
+
 			data = irq_desc_get_irq_data(desc);
 			cpumask_copy(&affinity_new, data->affinity);
 			cpu_clear(this_cpu, affinity_new);