Message ID | c0cec03a57070ef3662ae7e2ddffbdeefb128b81.1539891327.git.christophe.leroy@c-s.fr (mailing list archive) |
---|---|
State | Accepted |
Commit | 0f99153def98134403c9149128e59d3e1786cf04 |
Delegated to: | Scott Wood |
Headers | show |
Series | powerpc/msi: Fix compile error on mpc83xx | expand |
Context | Check | Description |
---|---|---|
snowpatch_ozlabs/apply_patch | success | next/apply_patch Successfully applied |
snowpatch_ozlabs/checkpatch | warning | Test checkpatch on branch next |
snowpatch_ozlabs/build-ppc64le | success | Test build-ppc64le on branch next |
snowpatch_ozlabs/build-ppc64be | success | Test build-ppc64be on branch next |
snowpatch_ozlabs/build-ppc64e | success | Test build-ppc64e on branch next |
snowpatch_ozlabs/build-ppc32 | success | Test build-ppc32 on branch next |
On Fri, 2018-10-19 at 06:12:50 UTC, Christophe Leroy wrote: > mpic_get_primary_version() is not defined when not using MPIC. > The compile error log like: > > arch/powerpc/sysdev/built-in.o: In function `fsl_of_msi_probe': > fsl_msi.c:(.text+0x150c): undefined reference to `fsl_mpic_primary_get_version' > > Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com> > Signed-off-by: Scott Wood <scottwood@freescale.com> > Reported-by: Radu Rendec <radu.rendec@gmail.com> > Fixes: 807d38b73b6 ("powerpc/mpic: Add get_version API both for internal and external use") > Cc: stable@vger.kernel.org > Signed-off-by: Christophe Leroy <christophe.leroy@c-s.fr> Applied to powerpc next, thanks. https://git.kernel.org/powerpc/c/0f99153def98134403c9149128e59d cheers
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h index fad8ddd697ac..0abf2e7fd222 100644 --- a/arch/powerpc/include/asm/mpic.h +++ b/arch/powerpc/include/asm/mpic.h @@ -393,7 +393,14 @@ extern struct bus_type mpic_subsys; #define MPIC_REGSET_TSI108 MPIC_REGSET(1) /* Tsi108/109 PIC */ /* Get the version of primary MPIC */ +#ifdef CONFIG_MPIC extern u32 fsl_mpic_primary_get_version(void); +#else +static inline u32 fsl_mpic_primary_get_version(void) +{ + return 0; +} +#endif /* Allocate the controller structure and setup the linux irq descs * for the range if interrupts passed in. No HW initialization is