2018-03-13 12:09:13

by Arnd Bergmann

[permalink] [raw]
Subject: [PATCH] 40iw: include linux/irq.h

We get a build failure on ARM unless the header is included explicitly:

drivers/infiniband/hw/i40iw/i40iw_verbs.c: In function 'i40iw_get_vector_affinity':
drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: implicit declaration of function 'irq_get_affinity_mask'; did you mean 'irq_create_affinity_masks'? [-Werror=implicit-function-declaration]
return irq_get_affinity_mask(msix_vec->irq);
^~~~~~~~~~~~~~~~~~~~~
irq_create_affinity_masks
drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: returning 'int' from a function with return type 'const struct cpumask *' makes pointer from integer without a cast [-Werror=int-conversion]
return irq_get_affinity_mask(msix_vec->irq);

Fixes: 7e952b19eb63 ("i40iw: Implement get_vector_affinity API")
Signed-off-by: Arnd Bergmann <[email protected]>
---
drivers/infiniband/hw/i40iw/i40iw_verbs.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/infiniband/hw/i40iw/i40iw_verbs.c b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
index a51798578f27..f3af952402e9 100644
--- a/drivers/infiniband/hw/i40iw/i40iw_verbs.c
+++ b/drivers/infiniband/hw/i40iw/i40iw_verbs.c
@@ -38,6 +38,7 @@
#include <linux/highmem.h>
#include <linux/time.h>
#include <linux/hugetlb.h>
+#include <linux/irq.h>
#include <asm/byteorder.h>
#include <net/ip.h>
#include <rdma/ib_verbs.h>
--
2.9.0



2018-03-13 13:21:40

by Shiraz Saleem

[permalink] [raw]
Subject: Re: [PATCH] 40iw: include linux/irq.h

On Tue, Mar 13, 2018 at 01:06:20PM +0100, Arnd Bergmann wrote:
> We get a build failure on ARM unless the header is included explicitly:
>
> drivers/infiniband/hw/i40iw/i40iw_verbs.c: In function 'i40iw_get_vector_affinity':
> drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: implicit declaration of function 'irq_get_affinity_mask'; did you mean 'irq_create_affinity_masks'? [-Werror=implicit-function-declaration]
> return irq_get_affinity_mask(msix_vec->irq);
> ^~~~~~~~~~~~~~~~~~~~~
> irq_create_affinity_masks
> drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: returning 'int' from a function with return type 'const struct cpumask *' makes pointer from integer without a cast [-Werror=int-conversion]
> return irq_get_affinity_mask(msix_vec->irq);
>
> Fixes: 7e952b19eb63 ("i40iw: Implement get_vector_affinity API")
> Signed-off-by: Arnd Bergmann <[email protected]>
> ---

Looks like you beat me to it. 0-day caught this on rdma-nxt and I was going to send the fix today.

Typo in the subject. 40iw --> i40iw. Othwerwise, looks good.

Thanks for the patch, Arnd!

Shiraz


2018-03-14 20:12:09

by Doug Ledford

[permalink] [raw]
Subject: Re: [PATCH] 40iw: include linux/irq.h

On Tue, 2018-03-13 at 08:20 -0500, Shiraz Saleem wrote:
> On Tue, Mar 13, 2018 at 01:06:20PM +0100, Arnd Bergmann wrote:
> > We get a build failure on ARM unless the header is included explicitly:
> >
> > drivers/infiniband/hw/i40iw/i40iw_verbs.c: In function 'i40iw_get_vector_affinity':
> > drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: implicit declaration of function 'irq_get_affinity_mask'; did you mean 'irq_create_affinity_masks'? [-Werror=implicit-function-declaration]
> > return irq_get_affinity_mask(msix_vec->irq);
> > ^~~~~~~~~~~~~~~~~~~~~
> > irq_create_affinity_masks
> > drivers/infiniband/hw/i40iw/i40iw_verbs.c:2747:9: error: returning 'int' from a function with return type 'const struct cpumask *' makes pointer from integer without a cast [-Werror=int-conversion]
> > return irq_get_affinity_mask(msix_vec->irq);
> >
> > Fixes: 7e952b19eb63 ("i40iw: Implement get_vector_affinity API")
> > Signed-off-by: Arnd Bergmann <[email protected]>
> > ---
>
> Looks like you beat me to it. 0-day caught this on rdma-nxt and I was going to send the fix today.
>
> Typo in the subject. 40iw --> i40iw. Othwerwise, looks good.
>
> Thanks for the patch, Arnd!
>
> Shiraz
>

Thanks, applied.

--
Doug Ledford <[email protected]>
GPG KeyID: B826A3330E572FDD
Key fingerprint = AE6B 1BDA 122B 23B4 265B 1274 B826 A333 0E57 2FDD


Attachments:
signature.asc (849.00 B)
This is a digitally signed message part