lkml.org 
[lkml]   [2018]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 176/222] powerpc/msi: Fix compile error on mpc83xx
    Date
    4.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Christophe Leroy <christophe.leroy@c-s.fr>

    commit 0f99153def98134403c9149128e59d3e1786cf04 upstream.

    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>
    Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/powerpc/include/asm/mpic.h | 7 +++++++
    1 file changed, 7 insertions(+)

    --- 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

    \
     
     \ /
      Last update: 2018-11-11 23:53    [W:4.185 / U:0.200 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site