lkml.org 
[lkml]   [2015]   [Aug]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/6] MIPS: CPS: #ifdef on CONFIG_MIPS_MT_SMP rather than CONFIG_MIPS_MT
    Date
    The CONFIG_MIPS_MT symbol can be selected by CONFIG_MIPS_VPE_LOADER in
    addition to CONFIG_MIPS_MT_SMP. We only want MT code in the CPS SMP boot
    vector if we're using MT for SMP. Thus switch the config symbol we ifdef
    against to CONFIG_MIPS_MT_SMP.

    Signed-off-by: Paul Burton <paul.burton@imgtec.com>
    Cc: Markos Chandras <markos.chandras@imgtec.com>
    Cc: <stable@vger.kernel.org> # 3.16+
    ---

    arch/mips/kernel/cps-vec.S | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/arch/mips/kernel/cps-vec.S b/arch/mips/kernel/cps-vec.S
    index 57642f5..209ded1 100644
    --- a/arch/mips/kernel/cps-vec.S
    +++ b/arch/mips/kernel/cps-vec.S
    @@ -224,7 +224,7 @@ LEAF(excep_ejtag)
    END(excep_ejtag)

    LEAF(mips_cps_core_init)
    -#ifdef CONFIG_MIPS_MT
    +#ifdef CONFIG_MIPS_MT_SMP
    /* Check that the core implements the MT ASE */
    has_mt t0, 3f

    @@ -311,7 +311,7 @@ LEAF(mips_cps_boot_vpes)

    /* Calculate this VPEs ID. If the core doesn't support MT use 0 */
    li t9, 0
    -#ifdef CONFIG_MIPS_MT
    +#ifdef CONFIG_MIPS_MT_SMP
    has_mt ta2, 1f

    /* Find the number of VPEs present in the core */
    @@ -339,7 +339,7 @@ LEAF(mips_cps_boot_vpes)
    PTR_L ta3, COREBOOTCFG_VPECONFIG(t0)
    PTR_ADDU v0, v0, ta3

    -#ifdef CONFIG_MIPS_MT
    +#ifdef CONFIG_MIPS_MT_SMP

    /* If the core doesn't support MT then return */
    bnez ta2, 1f
    @@ -453,7 +453,7 @@ LEAF(mips_cps_boot_vpes)

    2: .set pop

    -#endif /* CONFIG_MIPS_MT */
    +#endif /* CONFIG_MIPS_MT_SMP */

    /* Return */
    jr ra
    --
    2.5.0


    \
     
     \ /
      Last update: 2015-08-06 01:01    [W:2.250 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site