Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b2e5d8588de0b5341eddad87dbe48d2185eaa3dd

Authored by Ingo Molnar
1 parent 4420471f14
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

irq: change ->set_affinity() to return status, fix 

This build failure:

 arch/powerpc/sysdev/mpic.c:810: error: conflicting types for 'mpic_set_affinity'
 arch/powerpc/sysdev/mpic.h:39: error: previous declaration of 'mpic_set_affinity' was here
 make[2]: *** [arch/powerpc/sysdev/mpic.o] Error 1
 make[2]: *** Waiting for unfinished jobs....

Triggers because the function prototype was not updated when the
function call signature got changed by:

   d5dedd4: irq: change ->set_affinity() to return status

[ Impact: build fix on powerpc ]

Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: linux-arch@vger.kernel.org
LKML-Reference: <49F654E9.4070809@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 1 additions and 1 deletions Side-by-side Diff

arch/powerpc/sysdev/mpic.h
Diff comments   View file @ b2e5d85
... ... @@ -36,7 +36,7 @@
36 36  
37 37 extern int mpic_set_irq_type(unsigned int virq, unsigned int flow_type);
38 38 extern void mpic_set_vector(unsigned int virq, unsigned int vector);
39   -extern void mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask);
  39 +extern int mpic_set_affinity(unsigned int irq, const struct cpumask *cpumask);
40 40  
41 41 #endif /* _POWERPC_SYSDEV_MPIC_H */