projects
/
linux-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6da6c0d
)
sh: fix build failure for J2 cpu with SMP disabled
author
Rich Felker
<dalias@libc.org>
Sat, 5 May 2018 20:40:23 +0000
(16:40 -0400)
committer
Rich Felker
<dalias@libc.org>
Sat, 5 May 2018 20:51:40 +0000
(16:51 -0400)
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>
arch/sh/kernel/cpu/sh2/probe.c
patch
|
blob
|
blame
|
history
diff --git
a/arch/sh/kernel/cpu/sh2/probe.c
b/arch/sh/kernel/cpu/sh2/probe.c
index 4205f6d42b6938cb5a65946932672c3daf19abd4..a5bd03642678906a21e1d5fc8f853b4264bfd2e8 100644
(file)
--- 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;