projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'stable/xen-pcifront-0.8.2' of git://git.kernel.org/pub/scm/linux/kernel...
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
arch
/
x86
/
kernel
/
apic
/
io_apic.c
diff --git
a/arch/x86/kernel/apic/io_apic.c
b/arch/x86/kernel/apic/io_apic.c
index 8ae808d110f445f352ca686faf3a29d9d93bfa50..0929191d83cf5264751fbfffd19554f78f986848 100644
(file)
--- a/
arch/x86/kernel/apic/io_apic.c
+++ b/
arch/x86/kernel/apic/io_apic.c
@@
-3331,7
+3331,7
@@
static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq)
return 0;
}
return 0;
}
-int
arch
_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+int
native
_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
{
int node, ret, sub_handle, index = 0;
unsigned int irq, irq_want;
{
int node, ret, sub_handle, index = 0;
unsigned int irq, irq_want;
@@
-3389,7
+3389,7
@@
error:
return ret;
}
return ret;
}
-void
arch
_teardown_msi_irq(unsigned int irq)
+void
native
_teardown_msi_irq(unsigned int irq)
{
destroy_irq(irq);
}
{
destroy_irq(irq);
}
@@
-3650,6
+3650,11
@@
void __init probe_nr_irqs_gsi(void)
printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
}
printk(KERN_DEBUG "nr_irqs_gsi: %d\n", nr_irqs_gsi);
}
+int get_nr_irqs_gsi(void)
+{
+ return nr_irqs_gsi;
+}
+
#ifdef CONFIG_SPARSE_IRQ
int __init arch_probe_nr_irqs(void)
{
#ifdef CONFIG_SPARSE_IRQ
int __init arch_probe_nr_irqs(void)
{