MIPS: Loongson64: Select SMP in Kconfig to avoid build error
authorTiezhu Yang <yangtiezhu@loongson.cn>
Sat, 10 Oct 2020 23:47:51 +0000 (07:47 +0800)
committerThomas Bogendoerfer <tsbogend@alpha.franken.de>
Mon, 12 Oct 2020 09:22:40 +0000 (11:22 +0200)
In the current code, CONFIG_SMP can be set as N by user on the Loongson
platform, then there exists the following build error under !CONFIG_SMP:

  CC      arch/mips/kernel/asm-offsets.s
In file included from ./include/linux/gfp.h:9:0,
                 from ./include/linux/xarray.h:14,
                 from ./include/linux/radix-tree.h:18,
                 from ./include/linux/fs.h:15,
                 from ./include/linux/compat.h:17,
                 from arch/mips/kernel/asm-offsets.c:12:
./include/linux/topology.h: In function 'numa_node_id':
./include/linux/topology.h:119:2: error: implicit declaration of function 'cpu_logical_map' [-Werror=implicit-function-declaration]
  return cpu_to_node(raw_smp_processor_id());
  ^
cc1: some warnings being treated as errors
scripts/Makefile.build:117: recipe for target 'arch/mips/kernel/asm-offsets.s' failed
make[1]: *** [arch/mips/kernel/asm-offsets.s] Error 1

Select SMP in Kconfig to avoid the above build error and then remove
CONFIG_SMP=y in loongson3_defconfig.

Signed-off-by: Tiezhu Yang <yangtiezhu@loongson.cn>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
arch/mips/Kconfig
arch/mips/configs/loongson3_defconfig

index b557fa5..75f26d1 100644 (file)
@@ -488,6 +488,7 @@ config MACH_LOONGSON64
        select SYS_SUPPORTS_ZBOOT
        select ZONE_DMA32
        select NUMA
+       select SMP
        select COMMON_CLK
        select USE_OF
        select BUILTIN_DTB
index a5005c8..38a817e 100644 (file)
@@ -30,7 +30,6 @@ CONFIG_EMBEDDED=y
 CONFIG_PERF_EVENTS=y
 CONFIG_MACH_LOONGSON64=y
 CONFIG_CPU_HAS_MSA=y
-CONFIG_SMP=y
 CONFIG_NR_CPUS=16
 CONFIG_HZ_256=y
 CONFIG_KEXEC=y