diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-09-25 20:39:01 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-09-25 20:39:01 +0200 |
| commit | e4ae4c8ea7c65f61fde29c689d148c8c9e05305a (patch) | |
| tree | ea4726172adefc47f1a9e30dbefbc97f147d2806 /arch/x86/include/asm/irqdomain.h | |
| parent | ae41a2a40ed4253b9e1e111df409bbecab0f9800 (diff) | |
| parent | ec0f7cd273dc41ab28bba703cac82690ea5f2863 (diff) | |
| download | linux-e4ae4c8ea7c65f61fde29c689d148c8c9e05305a.tar.gz | |
Merge branch 'irq/core' into x86/apic
Pick up the dependencies for the vector management rework series.
Diffstat (limited to 'arch/x86/include/asm/irqdomain.h')
| -rw-r--r-- | arch/x86/include/asm/irqdomain.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/irqdomain.h b/arch/x86/include/asm/irqdomain.h index d26075b52885..1d9091ffa140 100644 --- a/arch/x86/include/asm/irqdomain.h +++ b/arch/x86/include/asm/irqdomain.h @@ -41,8 +41,8 @@ extern int mp_irqdomain_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs, void *arg); extern void mp_irqdomain_free(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs); -extern void mp_irqdomain_activate(struct irq_domain *domain, - struct irq_data *irq_data); +extern int mp_irqdomain_activate(struct irq_domain *domain, + struct irq_data *irq_data, bool early); extern void mp_irqdomain_deactivate(struct irq_domain *domain, struct irq_data *irq_data); extern int mp_irqdomain_ioapic_idx(struct irq_domain *domain); |