From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 24 Mar 2009 14:19:45 +0000 (+0100)
Subject: Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and ... 
X-Git-Tag: v2.6.30-rc3~72^2~20
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=29219683c46cb89edf5c58418b5305b14646d030;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'x86/apic', 'x86/cleanups', 'x86/mm', 'x86/pat', 'x86/setup' and 'x86/signal'; commit 'v2.6.29' into x86/core
---

29219683c46cb89edf5c58418b5305b14646d030
diff --cc arch/x86/kernel/apic/io_apic.c
index d882c03604ee,ea97e5efa907,42cdc78427a2,42cdc78427a2,42cdc78427a2,42cdc78427a2,bc7ac4da90d7..86827d85488a
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@@@@@@ -3464,8 -3464,8 -3464,8 -3464,8 -3464,8 -3464,8 -3504,11 +3464,8 @@@@@@@@ int arch_setup_msi_irqs(struct pci_dev 
       	int ret, sub_handle;
       	struct msi_desc *msidesc;
       	unsigned int irq_want;
      -
      -#ifdef CONFIG_INTR_REMAP
- -----	struct intel_iommu *iommu = 0;
+ +++++	struct intel_iommu *iommu = NULL;
       	int index = 0;
      -#endif
       
       	irq_want = nr_irqs_gsi;
       	sub_handle = 0;