diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:40:48 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-10 00:40:48 +0100 |
| commit | 5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1 (patch) | |
| tree | a67a6a4499a235a2aab53a61bf1badff484bc345 /arch/x86/kernel/io_apic.c | |
| parent | 249d51b53aea1b7cdb1be65a1a9a0c59d9e06f3e (diff) | |
| parent | 18114f61359ac05e3aa797d53d63f40db41f798d (diff) | |
| download | linux-5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1.tar.gz linux-5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1.tar.bz2 linux-5d96218b4a5ee0c5ff0ac87f3ba90cfa86ca0ca1.zip | |
Merge branch 'x86/uaccess' into core/percpu
Diffstat (limited to 'arch/x86/kernel/io_apic.c')
| -rw-r--r-- | arch/x86/kernel/io_apic.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index 0a7f6d6b1206..c0498daf01c3 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c @@ -3466,40 +3466,6 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq) return 0; } -int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc) -{ - unsigned int irq; - int ret; - unsigned int irq_want; - - irq_want = nr_irqs_gsi; - irq = create_irq_nr(irq_want); - if (irq == 0) - return -1; - -#ifdef CONFIG_INTR_REMAP - if (!intr_remapping_enabled) - goto no_ir; - - ret = msi_alloc_irte(dev, irq, 1); - if (ret < 0) - goto error; -no_ir: -#endif - ret = setup_msi_irq(dev, msidesc, irq); - if (ret < 0) { - destroy_irq(irq); - return ret; - } - return 0; - -#ifdef CONFIG_INTR_REMAP -error: - destroy_irq(irq); - return ret; -#endif -} - int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) { unsigned int irq; |