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/platform/uv/uv_irq.c | |
| parent | ae41a2a40ed4253b9e1e111df409bbecab0f9800 (diff) | |
| parent | ec0f7cd273dc41ab28bba703cac82690ea5f2863 (diff) | |
| download | linux-e4ae4c8ea7c65f61fde29c689d148c8c9e05305a.tar.bz2 | |
Merge branch 'irq/core' into x86/apic
Pick up the dependencies for the vector management rework series.
Diffstat (limited to 'arch/x86/platform/uv/uv_irq.c')
| -rw-r--r-- | arch/x86/platform/uv/uv_irq.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c index 03fc397335b7..5f6fd860820a 100644 --- a/arch/x86/platform/uv/uv_irq.c +++ b/arch/x86/platform/uv/uv_irq.c @@ -127,10 +127,11 @@ static void uv_domain_free(struct irq_domain *domain, unsigned int virq, * Re-target the irq to the specified CPU and enable the specified MMR located * on the specified blade to allow the sending of MSIs to the specified CPU. */ -static void uv_domain_activate(struct irq_domain *domain, - struct irq_data *irq_data) +static int uv_domain_activate(struct irq_domain *domain, + struct irq_data *irq_data, bool early) { uv_program_mmr(irqd_cfg(irq_data), irq_data->chip_data); + return 0; } /* |