MIPS: Get rid of CONFIG_CPU_HAS_LLSC again
authorPaul Bolle <pebolle@tiscali.nl>
Tue, 5 Mar 2013 12:20:20 +0000 (13:20 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Tue, 12 Mar 2013 17:58:02 +0000 (18:58 +0100)
Commit f7ade3c168e4f437c11f57be012992bbb0e3075c ("MIPS: Get rid of
CONFIG_CPU_HAS_LLSC") did what it promised to do. But since then that
macro and its Kconfig symbol popped up again. Get rid of those again.

Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Cc: Jonas Gorski <jogo@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/4978/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/Kconfig
arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h

index e8e10b794b875a36aac20e3966f43ec11add2d57..1a166d98773ef552bf061a031195f57a4765df59 100644 (file)
@@ -1493,7 +1493,6 @@ config CPU_XLP
        select CPU_SUPPORTS_32BIT_KERNEL
        select CPU_SUPPORTS_64BIT_KERNEL
        select CPU_SUPPORTS_HIGHMEM
-       select CPU_HAS_LLSC
        select WEAK_ORDERING
        select WEAK_REORDERING_BEYOND_LLSC
        select CPU_HAS_PREFETCH
index d9c82841903775734d6a462de251deaba1058715..b40f37fb3dee80e550d8495486b706a05af34763 100644 (file)
 /* #define cpu_has_prefetch    ? */
 #define cpu_has_mcheck         1
 /* #define cpu_has_ejtag       ? */
-#ifdef CONFIG_CPU_HAS_LLSC
-#define cpu_has_llsc           1
-#else
 #define cpu_has_llsc           0
-#endif
 /* #define cpu_has_vtag_icache ? */
 /* #define cpu_has_dc_aliases  ? */
 /* #define cpu_has_ic_fills_f_dc ? */