diff options
author | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
---|---|---|
committer | Ross Zwisler <ross.zwisler@linux.intel.com> | 2018-02-03 00:26:10 -0700 |
commit | d121f07691415df824e6b60520f782f6d13b3c81 (patch) | |
tree | 422ad3cc6fd631604fef4e469e49bacba8202e52 /arch/x86/platform/uv/uv_irq.c | |
parent | libnvdimm, namespace: remove redundant initialization of 'nd_mapping' (diff) | |
parent | dax: require 'struct page' by default for filesystem dax (diff) | |
download | linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.tar.xz linux-dev-d121f07691415df824e6b60520f782f6d13b3c81.zip |
Merge branch 'for-4.16/dax' into libnvdimm-for-next
Diffstat (limited to 'arch/x86/platform/uv/uv_irq.c')
-rw-r--r-- | arch/x86/platform/uv/uv_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/uv/uv_irq.c b/arch/x86/platform/uv/uv_irq.c index 5f6fd860820a..e4cb9f4cde8a 100644 --- a/arch/x86/platform/uv/uv_irq.c +++ b/arch/x86/platform/uv/uv_irq.c @@ -128,7 +128,7 @@ static void uv_domain_free(struct irq_domain *domain, unsigned int virq, * on the specified blade to allow the sending of MSIs to the specified CPU. */ static int uv_domain_activate(struct irq_domain *domain, - struct irq_data *irq_data, bool early) + struct irq_data *irq_data, bool reserve) { uv_program_mmr(irqd_cfg(irq_data), irq_data->chip_data); return 0; |