xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Ingo Molnar
2009-03-24 15:19:45 +01:00
parent 04c93ce499 1cc185211a 45c7b28f3c 9cdec04938 c8608d6b58 14fc9fbc70 8e0ee43bc2
commit 29219683c4
96 changed files with 2011 additions and 2358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kernel/apic/io_apic.c
View File

@@ -3464,7 +3464,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
int ret, sub_handle;
struct msi_desc *msidesc;
unsigned int irq_want;
struct intel_iommu *iommu = 0;
struct intel_iommu *iommu = NULL;
int index = 0;
irq_want = nr_irqs_gsi;
@@ -3599,7 +3599,7 @@ static void hpet_msi_set_affinity(unsigned int irq, const struct cpumask *mask)
#endif /* CONFIG_SMP */
struct irq_chip hpet_msi_type = {
static struct irq_chip hpet_msi_type = {
.name = "HPET_MSI",
.unmask = hpet_msi_unmask,
.mask = hpet_msi_mask,