lkml.org 
[lkml]   [2018]   [Jun]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.16 186/279] sh: fix build failure for J2 cpu with SMP disabled
    Date
    4.16-stable review patch.  If anyone has any objections, please let me know.

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

    From: Rich Felker <dalias@libc.org>

    [ Upstream commit 6cb465972c4eb6741b3094a58a65e527fc63c100 ]

    The sh asm/smp.h defines a fallback hard_smp_processor_id macro for
    the !SMP case, but linux/smp.h never includes asm/smp.h in the !SMP
    case.

    Signed-off-by: Rich Felker <dalias@libc.org>
    Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/sh/kernel/cpu/sh2/probe.c | 4 ++++
    1 file changed, 4 insertions(+)

    --- a/arch/sh/kernel/cpu/sh2/probe.c
    +++ b/arch/sh/kernel/cpu/sh2/probe.c
    @@ -43,7 +43,11 @@ void __ref cpu_probe(void)
    #endif

    #if defined(CONFIG_CPU_J2)
    +#if defined(CONFIG_SMP)
    unsigned cpu = hard_smp_processor_id();
    +#else
    + unsigned cpu = 0;
    +#endif
    if (cpu == 0) of_scan_flat_dt(scan_cache, NULL);
    if (j2_ccr_base) __raw_writel(0x80000303, j2_ccr_base + 4*cpu);
    if (cpu != 0) return;

    \
     
     \ /
      Last update: 2018-06-18 11:36    [W:4.036 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site