| From foo@baz Sun Jun 17 12:07:34 CEST 2018 |
| From: Rich Felker <dalias@libc.org> |
| Date: Sat, 5 May 2018 16:40:23 -0400 |
| Subject: sh: fix build failure for J2 cpu with SMP disabled |
| |
| 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; |
