Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631b0af9 authored by Paul Bolle's avatar Paul Bolle Committed by Ralf Baechle
Browse files

MIPS: Get rid of CONFIG_CPU_HAS_LLSC again 



Commit f7ade3c1 ("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: default avatarPaul 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: default avatarRalf Baechle <ralf@linux-mips.org>
parent 383c97b4

arch/mips/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -1493,7 +1493,6 @@ config CPU_XLP 
	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM

	select CPU_SUPPORTS_HIGHMEM

	select CPU_HAS_LLSC

	select WEAK_ORDERING

	select WEAK_ORDERING

	select WEAK_REORDERING_BEYOND_LLSC

	select WEAK_REORDERING_BEYOND_LLSC

	select CPU_HAS_PREFETCH

	select CPU_HAS_PREFETCH

arch/mips/include/asm/mach-sead3/cpu-feature-overrides.h

+0 −4
Original line number Original line Diff line number Diff line
@@ -28,11 +28,7 @@ 
/* #define cpu_has_prefetch	? */

/* #define cpu_has_prefetch	? */

#define cpu_has_mcheck		1

#define cpu_has_mcheck		1

/* #define cpu_has_ejtag	? */

/* #define cpu_has_ejtag	? */

#ifdef CONFIG_CPU_HAS_LLSC

#define cpu_has_llsc		1

#else

#define cpu_has_llsc		0

#define cpu_has_llsc		0

#endif

/* #define cpu_has_vtag_icache	? */

/* #define cpu_has_vtag_icache	? */

/* #define cpu_has_dc_aliases	? */

/* #define cpu_has_dc_aliases	? */

/* #define cpu_has_ic_fills_f_dc ? */

/* #define cpu_has_ic_fills_f_dc ? */