Commit f7ade3c1 authored by Ralf Baechle's avatar Ralf Baechle
Browse files

MIPS: Get rid of CONFIG_CPU_HAS_LLSC 



CONFIG_CPU_HAS_LLSC duplicated the function of cpu_has_llsc for no good
reason and and the results if the one was enabled and the other disabled
was very unobvious.  Remove it now that there are no more remaining users.

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent b8d6f78c

arch/mips/Kconfig

+0 −20
Original line number Diff line number Diff line
@@ -1041,7 +1041,6 @@ config CPU_LOONGSON2E 
config CPU_MIPS32_R1

	bool "MIPS32 Release 1"

	depends on SYS_HAS_CPU_MIPS32_R1

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM
@@ -1059,7 +1058,6 @@ config CPU_MIPS32_R1 
config CPU_MIPS32_R2

	bool "MIPS32 Release 2"

	depends on SYS_HAS_CPU_MIPS32_R2

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM
@@ -1073,7 +1071,6 @@ config CPU_MIPS32_R2 
config CPU_MIPS64_R1

	bool "MIPS64 Release 1"

	depends on SYS_HAS_CPU_MIPS64_R1

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1093,7 +1090,6 @@ config CPU_MIPS64_R1 
config CPU_MIPS64_R2

	bool "MIPS64 Release 2"

	depends on SYS_HAS_CPU_MIPS64_R2

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1139,7 +1135,6 @@ config CPU_VR41XX 
config CPU_R4300

	bool "R4300"

	depends on SYS_HAS_CPU_R4300

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	help
@@ -1148,7 +1143,6 @@ config CPU_R4300 
config CPU_R4X00

	bool "R4x00"

	depends on SYS_HAS_CPU_R4X00

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	help
@@ -1158,7 +1152,6 @@ config CPU_R4X00 
config CPU_TX49XX

	bool "R49XX"

	depends on SYS_HAS_CPU_TX49XX

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1166,7 +1159,6 @@ config CPU_TX49XX 
config CPU_R5000

	bool "R5000"

	depends on SYS_HAS_CPU_R5000

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	help
@@ -1175,14 +1167,12 @@ config CPU_R5000 
config CPU_R5432

	bool "R5432"

	depends on SYS_HAS_CPU_R5432

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL



config CPU_R5500

	bool "R5500"

	depends on SYS_HAS_CPU_R5500

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HUGEPAGES
@@ -1193,7 +1183,6 @@ config CPU_R5500 
config CPU_R6000

	bool "R6000"

	depends on EXPERIMENTAL

	select CPU_HAS_LLSC

	depends on SYS_HAS_CPU_R6000

	select CPU_SUPPORTS_32BIT_KERNEL

	help
@@ -1203,7 +1192,6 @@ config CPU_R6000 
config CPU_NEVADA

	bool "RM52xx"

	depends on SYS_HAS_CPU_NEVADA

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	help
@@ -1213,7 +1201,6 @@ config CPU_R8000 
	bool "R8000"

	depends on EXPERIMENTAL

	depends on SYS_HAS_CPU_R8000

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_64BIT_KERNEL

	help
@@ -1223,7 +1210,6 @@ config CPU_R8000 
config CPU_R10000

	bool "R10000"

	depends on SYS_HAS_CPU_R10000

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1234,7 +1220,6 @@ config CPU_R10000 
config CPU_RM7000

	bool "RM7000"

	depends on SYS_HAS_CPU_RM7000

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1243,7 +1228,6 @@ config CPU_RM7000 
config CPU_RM9000

	bool "RM9000"

	depends on SYS_HAS_CPU_RM9000

	select CPU_HAS_LLSC

	select CPU_HAS_PREFETCH

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL
@@ -1253,7 +1237,6 @@ config CPU_RM9000 
config CPU_SB1

	bool "SB1"

	depends on SYS_HAS_CPU_SB1

	select CPU_HAS_LLSC

	select CPU_SUPPORTS_32BIT_KERNEL

	select CPU_SUPPORTS_64BIT_KERNEL

	select CPU_SUPPORTS_HIGHMEM
@@ -1673,9 +1656,6 @@ config SB1_PASS_2_1_WORKAROUNDS 
config 64BIT_PHYS_ADDR

	bool



config CPU_HAS_LLSC

	bool



config CPU_HAS_SMARTMIPS

	depends on SYS_SUPPORTS_SMARTMIPS

	bool "Support for the SmartMIPS ASE"

arch/mips/configs/ar7_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -125,7 +125,6 @@ CONFIG_CPU_HAS_PREFETCH=y 
CONFIG_MIPS_MT_DISABLED=y

# CONFIG_MIPS_MT_SMP is not set

# CONFIG_MIPS_MT_SMTC is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/bcm47xx_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -111,7 +111,6 @@ CONFIG_CPU_HAS_PREFETCH=y 
CONFIG_MIPS_MT_DISABLED=y

# CONFIG_MIPS_MT_SMP is not set

# CONFIG_MIPS_MT_SMTC is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/bigsur_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ CONFIG_PAGE_SIZE_4KB=y 
CONFIG_MIPS_MT_DISABLED=y

# CONFIG_MIPS_MT_SMP is not set

# CONFIG_MIPS_MT_SMTC is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

arch/mips/configs/cobalt_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ CONFIG_PAGE_SIZE_4KB=y 
CONFIG_MIPS_MT_DISABLED=y

# CONFIG_MIPS_MT_SMP is not set

# CONFIG_MIPS_MT_SMTC is not set

CONFIG_CPU_HAS_LLSC=y

CONFIG_CPU_HAS_SYNC=y

CONFIG_GENERIC_HARDIRQS=y

CONFIG_GENERIC_IRQ_PROBE=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE