target/linux/ramips/patches-3.10/0509-MIPS-Kconfig-CMP-support-needs-to-select-SMP-as-well.patch

   1 From 184edf882ebb7885b49fa231a503205da94e78f0 Mon Sep 17 00:00:00 2001
   2 From: Markos Chandras <markos.chandras@imgtec.com>
   3 Date: Wed, 2 Oct 2013 12:40:26 -0500
   4 Subject: [PATCH 065/105] MIPS: Kconfig: CMP support needs to select SMP as
   5  well
   6
   7 The CMP code is only designed to work with SMP configurations.
   8 Fixes multiple build problems on certain randconfigs:
   9
  10 In file included from arch/mips/kernel/smp-cmp.c:34:0:
  11 arch/mips/include/asm/smp.h:28:0:
  12 error: "raw_smp_processor_id" redefined [-Werror]
  13
  14 In file included from include/linux/sched.h:30:0,
  15 from arch/mips/kernel/smp-cmp.c:22:
  16 include/linux/smp.h:135:0: note: this is the location of the
  17 previous definition
  18
  19 In file included from arch/mips/kernel/smp-cmp.c:34:0:
  20 arch/mips/include/asm/smp.h:57:20:
  21 error: redefinition of 'smp_send_reschedule'
  22
  23 In file included from include/linux/sched.h:30:0,
  24 from arch/mips/kernel/smp-cmp.c:22:
  25 include/linux/smp.h:179:20: note: previous
  26 definition of 'smp_send_reschedule' was here
  27
  28 In file included from arch/mips/kernel/smp-cmp.c:34:0:
  29 arch/mips/include/asm/smp.h: In function 'smp_send_reschedule':
  30 arch/mips/include/asm/smp.h:61:8:
  31 error: dereferencing pointer to incomplete type
  32 [...]
  33
  34 Signed-off-by: Markos Chandras <markos.chandras@imgtec.com>
  35 Cc: linux-mips@linux-mips.org
  36 Cc: Markos Chandras <markos.chandras@imgtec.com>
  37 Patchwork: https://patchwork.linux-mips.org/patch/5812/
  38 Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  39 ---
  40  arch/mips/Kconfig |    1 +
  41  1 file changed, 1 insertion(+)
  42
  43 --- a/arch/mips/Kconfig
  44 +++ b/arch/mips/Kconfig
  45 @@ -2038,6 +2038,7 @@ config MIPS_VPE_APSP_API
  46  config MIPS_CMP
  47         bool "MIPS CMP framework support"
  48         depends on SYS_SUPPORTS_MIPS_CMP
  49 +       select SMP
  50         select SYNC_R4K
  51         select SYS_SUPPORTS_SMP
  52         select SYS_SUPPORTS_SCHED_SMT if SMP