MIPS: Octeon: Set kernel_uses_llsc to false on non-SMP builds.

Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

MIPS: Octeon: Set kernel_uses_llsc to false on non-SMP builds.
Signed-off-by: David Daney <ddaney@caviumnetworks.com> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
David Daney · Ralf Baechle
1 parent b791d1193a
Showing 1 changed file with 8 additions and 4 deletions Side-by-side Diff
arch/mips/include/asm/mach-cavium-octeon/cpu-feature-overrides.h
@@ -31,12 +31,16 @@
 #define cpu_has_cache_cdex_s	0
 #define cpu_has_prefetch	1
  
+#define cpu_has_llsc		1
 /*
- * We should disable LL/SC on non SMP systems as it is faster to
- * disable interrupts for atomic access than a LL/SC.  Unfortunatly we
- * cannot as this breaks asm/futex.h
+ * We Disable LL/SC on non SMP systems as it is faster to disable
+ * interrupts for atomic access than a LL/SC.
  */
-#define cpu_has_llsc		1
+#ifdef CONFIG_SMP
+# define kernel_uses_llsc	1
+#else
+# define kernel_uses_llsc	0
+#endif
 #define cpu_has_vtag_icache	1
 #define cpu_has_dc_aliases	0
 #define cpu_has_ic_fills_f_dc	0
...	...	@@ -31,12 +31,16 @@
31	31	#define cpu_has_cache_cdex_s 0
32	32	#define cpu_has_prefetch 1
33	33
	34	+#define cpu_has_llsc 1
34	35	/*
35		- * We should disable LL/SC on non SMP systems as it is faster to
36		- * disable interrupts for atomic access than a LL/SC. Unfortunatly we
37		- * cannot as this breaks asm/futex.h
	36	+ * We Disable LL/SC on non SMP systems as it is faster to disable
	37	+ * interrupts for atomic access than a LL/SC.
38	38	*/
39		-#define cpu_has_llsc 1
	39	+#ifdef CONFIG_SMP
	40	+# define kernel_uses_llsc 1
	41	+#else
	42	+# define kernel_uses_llsc 0
	43	+#endif
40	44	#define cpu_has_vtag_icache 1
41	45	#define cpu_has_dc_aliases 0
42	46	#define cpu_has_ic_fills_f_dc 0