diff options
24 files changed, 0 insertions, 31 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index b50be449d3f5..b5572f67118f 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -1492,14 +1492,6 @@ config CPU_HAS_LLSC | |||
1492 | for better performance, N if you don't know. You must say Y here | 1492 | for better performance, N if you don't know. You must say Y here |
1493 | for multiprocessor machines. | 1493 | for multiprocessor machines. |
1494 | 1494 | ||
1495 | config CPU_HAS_LLDSCD | ||
1496 | bool "lld/scd Instructions available" if CPU_ADVANCED | ||
1497 | default y if !CPU_ADVANCED && !CPU_R3000 && !CPU_VR41XX && !CPU_TX39XX && !CPU_MIPS32_R1 | ||
1498 | help | ||
1499 | Say Y here if your CPU has the lld and scd instructions, the 64-bit | ||
1500 | equivalents of ll and sc. Say Y here for better performance, N if | ||
1501 | you don't know. You must say Y here for multiprocessor machines. | ||
1502 | |||
1503 | config CPU_HAS_WB | 1495 | config CPU_HAS_WB |
1504 | bool "Writeback Buffer available" if CPU_ADVANCED | 1496 | bool "Writeback Buffer available" if CPU_ADVANCED |
1505 | default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION | 1497 | default y if !CPU_ADVANCED && CPU_R3000 && MACH_DECSTATION |
diff --git a/arch/mips/configs/bigsur_defconfig b/arch/mips/configs/bigsur_defconfig index 069f9d14983e..6fd353779813 100644 --- a/arch/mips/configs/bigsur_defconfig +++ b/arch/mips/configs/bigsur_defconfig | |||
@@ -130,7 +130,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
130 | # CONFIG_SIBYTE_DMA_PAGEOPS is not set | 130 | # CONFIG_SIBYTE_DMA_PAGEOPS is not set |
131 | # CONFIG_MIPS_MT is not set | 131 | # CONFIG_MIPS_MT is not set |
132 | CONFIG_CPU_HAS_LLSC=y | 132 | CONFIG_CPU_HAS_LLSC=y |
133 | CONFIG_CPU_HAS_LLDSCD=y | ||
134 | CONFIG_CPU_HAS_SYNC=y | 133 | CONFIG_CPU_HAS_SYNC=y |
135 | CONFIG_GENERIC_HARDIRQS=y | 134 | CONFIG_GENERIC_HARDIRQS=y |
136 | CONFIG_GENERIC_IRQ_PROBE=y | 135 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index 216f4023a81b..1d3ee18ea8bb 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
@@ -115,7 +115,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
115 | # CONFIG_MIPS_MT is not set | 115 | # CONFIG_MIPS_MT is not set |
116 | # CONFIG_CPU_ADVANCED is not set | 116 | # CONFIG_CPU_ADVANCED is not set |
117 | CONFIG_CPU_HAS_LLSC=y | 117 | CONFIG_CPU_HAS_LLSC=y |
118 | CONFIG_CPU_HAS_LLDSCD=y | ||
119 | CONFIG_CPU_HAS_SYNC=y | 118 | CONFIG_CPU_HAS_SYNC=y |
120 | CONFIG_GENERIC_HARDIRQS=y | 119 | CONFIG_GENERIC_HARDIRQS=y |
121 | CONFIG_GENERIC_IRQ_PROBE=y | 120 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index bea00a9e9269..a81e2de6947f 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
@@ -116,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
116 | # CONFIG_MIPS_MT is not set | 116 | # CONFIG_MIPS_MT is not set |
117 | # CONFIG_CPU_ADVANCED is not set | 117 | # CONFIG_CPU_ADVANCED is not set |
118 | CONFIG_CPU_HAS_LLSC=y | 118 | CONFIG_CPU_HAS_LLSC=y |
119 | CONFIG_CPU_HAS_LLDSCD=y | ||
120 | CONFIG_CPU_HAS_SYNC=y | 119 | CONFIG_CPU_HAS_SYNC=y |
121 | CONFIG_GENERIC_HARDIRQS=y | 120 | CONFIG_GENERIC_HARDIRQS=y |
122 | CONFIG_GENERIC_IRQ_PROBE=y | 121 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index 61f7171ca7ed..f1c27c2fb033 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig | |||
@@ -116,7 +116,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
116 | # CONFIG_MIPS_MT is not set | 116 | # CONFIG_MIPS_MT is not set |
117 | # CONFIG_CPU_ADVANCED is not set | 117 | # CONFIG_CPU_ADVANCED is not set |
118 | CONFIG_CPU_HAS_LLSC=y | 118 | CONFIG_CPU_HAS_LLSC=y |
119 | CONFIG_CPU_HAS_LLDSCD=y | ||
120 | CONFIG_CPU_HAS_SYNC=y | 119 | CONFIG_CPU_HAS_SYNC=y |
121 | CONFIG_GENERIC_HARDIRQS=y | 120 | CONFIG_GENERIC_HARDIRQS=y |
122 | CONFIG_GENERIC_IRQ_PROBE=y | 121 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index 14e3815f11e6..aa24d85ea94d 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
@@ -118,7 +118,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
118 | # CONFIG_64BIT_PHYS_ADDR is not set | 118 | # CONFIG_64BIT_PHYS_ADDR is not set |
119 | # CONFIG_CPU_ADVANCED is not set | 119 | # CONFIG_CPU_ADVANCED is not set |
120 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
121 | CONFIG_CPU_HAS_LLDSCD=y | ||
122 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
123 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
124 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 510819581d8a..eeed0e5ad260 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig | |||
@@ -121,7 +121,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
121 | # CONFIG_64BIT_PHYS_ADDR is not set | 121 | # CONFIG_64BIT_PHYS_ADDR is not set |
122 | # CONFIG_CPU_ADVANCED is not set | 122 | # CONFIG_CPU_ADVANCED is not set |
123 | CONFIG_CPU_HAS_LLSC=y | 123 | CONFIG_CPU_HAS_LLSC=y |
124 | CONFIG_CPU_HAS_LLDSCD=y | ||
125 | CONFIG_CPU_HAS_SYNC=y | 124 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 67979e3e606e..e56351abf87a 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -123,7 +123,6 @@ CONFIG_IP22_CPU_SCACHE=y | |||
123 | # CONFIG_64BIT_PHYS_ADDR is not set | 123 | # CONFIG_64BIT_PHYS_ADDR is not set |
124 | # CONFIG_CPU_ADVANCED is not set | 124 | # CONFIG_CPU_ADVANCED is not set |
125 | CONFIG_CPU_HAS_LLSC=y | 125 | CONFIG_CPU_HAS_LLSC=y |
126 | CONFIG_CPU_HAS_LLDSCD=y | ||
127 | CONFIG_CPU_HAS_SYNC=y | 126 | CONFIG_CPU_HAS_SYNC=y |
128 | CONFIG_GENERIC_HARDIRQS=y | 127 | CONFIG_GENERIC_HARDIRQS=y |
129 | CONFIG_GENERIC_IRQ_PROBE=y | 128 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig index 03af44d1d846..e17d3adff021 100644 --- a/arch/mips/configs/ip27_defconfig +++ b/arch/mips/configs/ip27_defconfig | |||
@@ -119,7 +119,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
119 | CONFIG_CPU_HAS_PREFETCH=y | 119 | CONFIG_CPU_HAS_PREFETCH=y |
120 | # CONFIG_MIPS_MT is not set | 120 | # CONFIG_MIPS_MT is not set |
121 | CONFIG_CPU_HAS_LLSC=y | 121 | CONFIG_CPU_HAS_LLSC=y |
122 | CONFIG_CPU_HAS_LLDSCD=y | ||
123 | CONFIG_CPU_HAS_SYNC=y | 122 | CONFIG_CPU_HAS_SYNC=y |
124 | CONFIG_GENERIC_HARDIRQS=y | 123 | CONFIG_GENERIC_HARDIRQS=y |
125 | CONFIG_GENERIC_IRQ_PROBE=y | 124 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index cba2a49cceb1..967e7acd8e1f 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -121,7 +121,6 @@ CONFIG_R5000_CPU_SCACHE=y | |||
121 | CONFIG_RM7000_CPU_SCACHE=y | 121 | CONFIG_RM7000_CPU_SCACHE=y |
122 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
123 | CONFIG_CPU_HAS_LLSC=y | 123 | CONFIG_CPU_HAS_LLSC=y |
124 | CONFIG_CPU_HAS_LLDSCD=y | ||
125 | CONFIG_CPU_HAS_SYNC=y | 124 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index e7ee1679af90..b5fa9639db6f 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig | |||
@@ -117,7 +117,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
117 | # CONFIG_MIPS_MT is not set | 117 | # CONFIG_MIPS_MT is not set |
118 | # CONFIG_CPU_ADVANCED is not set | 118 | # CONFIG_CPU_ADVANCED is not set |
119 | CONFIG_CPU_HAS_LLSC=y | 119 | CONFIG_CPU_HAS_LLSC=y |
120 | CONFIG_CPU_HAS_LLDSCD=y | ||
121 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
122 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
123 | CONFIG_GENERIC_IRQ_PROBE=y | 122 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 138c8a60a4dc..71386938d47f 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig | |||
@@ -114,7 +114,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
114 | # CONFIG_MIPS_MT is not set | 114 | # CONFIG_MIPS_MT is not set |
115 | # CONFIG_CPU_ADVANCED is not set | 115 | # CONFIG_CPU_ADVANCED is not set |
116 | CONFIG_CPU_HAS_LLSC=y | 116 | CONFIG_CPU_HAS_LLSC=y |
117 | CONFIG_CPU_HAS_LLDSCD=y | ||
118 | CONFIG_CPU_HAS_SYNC=y | 117 | CONFIG_CPU_HAS_SYNC=y |
119 | CONFIG_GENERIC_HARDIRQS=y | 118 | CONFIG_GENERIC_HARDIRQS=y |
120 | CONFIG_GENERIC_IRQ_PROBE=y | 119 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index 6238e0d6a430..14fb46886708 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig | |||
@@ -124,7 +124,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
124 | # CONFIG_64BIT_PHYS_ADDR is not set | 124 | # CONFIG_64BIT_PHYS_ADDR is not set |
125 | # CONFIG_CPU_ADVANCED is not set | 125 | # CONFIG_CPU_ADVANCED is not set |
126 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
127 | CONFIG_CPU_HAS_LLDSCD=y | ||
128 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
129 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
130 | CONFIG_GENERIC_IRQ_PROBE=y | 129 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index a7ad99b12fe5..6c5df76d48d9 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig | |||
@@ -121,7 +121,6 @@ CONFIG_R5000_CPU_SCACHE=y | |||
121 | # CONFIG_64BIT_PHYS_ADDR is not set | 121 | # CONFIG_64BIT_PHYS_ADDR is not set |
122 | # CONFIG_CPU_ADVANCED is not set | 122 | # CONFIG_CPU_ADVANCED is not set |
123 | CONFIG_CPU_HAS_LLSC=y | 123 | CONFIG_CPU_HAS_LLSC=y |
124 | CONFIG_CPU_HAS_LLDSCD=y | ||
125 | CONFIG_CPU_HAS_SYNC=y | 124 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index 9081ea5a9dbd..7ad8718c1b69 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
@@ -122,7 +122,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
122 | # CONFIG_64BIT_PHYS_ADDR is not set | 122 | # CONFIG_64BIT_PHYS_ADDR is not set |
123 | # CONFIG_CPU_ADVANCED is not set | 123 | # CONFIG_CPU_ADVANCED is not set |
124 | CONFIG_CPU_HAS_LLSC=y | 124 | CONFIG_CPU_HAS_LLSC=y |
125 | CONFIG_CPU_HAS_LLDSCD=y | ||
126 | CONFIG_CPU_HAS_SYNC=y | 125 | CONFIG_CPU_HAS_SYNC=y |
127 | CONFIG_GENERIC_HARDIRQS=y | 126 | CONFIG_GENERIC_HARDIRQS=y |
128 | CONFIG_GENERIC_IRQ_PROBE=y | 127 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index 570fc4d18166..e8d6bb3551a2 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig | |||
@@ -118,7 +118,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
118 | CONFIG_CPU_HAS_PREFETCH=y | 118 | CONFIG_CPU_HAS_PREFETCH=y |
119 | # CONFIG_MIPS_MT is not set | 119 | # CONFIG_MIPS_MT is not set |
120 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
121 | CONFIG_CPU_HAS_LLDSCD=y | ||
122 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
123 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
124 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 6634ab24715c..f3787b68bdd1 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
@@ -123,7 +123,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
123 | # CONFIG_64BIT_PHYS_ADDR is not set | 123 | # CONFIG_64BIT_PHYS_ADDR is not set |
124 | # CONFIG_CPU_ADVANCED is not set | 124 | # CONFIG_CPU_ADVANCED is not set |
125 | CONFIG_CPU_HAS_LLSC=y | 125 | CONFIG_CPU_HAS_LLSC=y |
126 | CONFIG_CPU_HAS_LLDSCD=y | ||
127 | CONFIG_CPU_HAS_SYNC=y | 126 | CONFIG_CPU_HAS_SYNC=y |
128 | CONFIG_GENERIC_HARDIRQS=y | 127 | CONFIG_GENERIC_HARDIRQS=y |
129 | CONFIG_GENERIC_IRQ_PROBE=y | 128 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index 4c396e1e2f0a..b6126ad4d06d 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig | |||
@@ -121,7 +121,6 @@ CONFIG_RM7000_CPU_SCACHE=y | |||
121 | CONFIG_CPU_HAS_PREFETCH=y | 121 | CONFIG_CPU_HAS_PREFETCH=y |
122 | # CONFIG_MIPS_MT is not set | 122 | # CONFIG_MIPS_MT is not set |
123 | CONFIG_CPU_HAS_LLSC=y | 123 | CONFIG_CPU_HAS_LLSC=y |
124 | CONFIG_CPU_HAS_LLDSCD=y | ||
125 | CONFIG_CPU_HAS_SYNC=y | 124 | CONFIG_CPU_HAS_SYNC=y |
126 | CONFIG_GENERIC_HARDIRQS=y | 125 | CONFIG_GENERIC_HARDIRQS=y |
127 | CONFIG_GENERIC_IRQ_PROBE=y | 126 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/pnx8550-v2pci_defconfig b/arch/mips/configs/pnx8550-v2pci_defconfig index d9a0d2fdba4f..4c650e708133 100644 --- a/arch/mips/configs/pnx8550-v2pci_defconfig +++ b/arch/mips/configs/pnx8550-v2pci_defconfig | |||
@@ -116,7 +116,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
116 | # CONFIG_64BIT_PHYS_ADDR is not set | 116 | # CONFIG_64BIT_PHYS_ADDR is not set |
117 | CONFIG_CPU_ADVANCED=y | 117 | CONFIG_CPU_ADVANCED=y |
118 | CONFIG_CPU_HAS_LLSC=y | 118 | CONFIG_CPU_HAS_LLSC=y |
119 | # CONFIG_CPU_HAS_LLDSCD is not set | ||
120 | # CONFIG_CPU_HAS_WB is not set | 119 | # CONFIG_CPU_HAS_WB is not set |
121 | CONFIG_CPU_HAS_SYNC=y | 120 | CONFIG_CPU_HAS_SYNC=y |
122 | CONFIG_GENERIC_HARDIRQS=y | 121 | CONFIG_GENERIC_HARDIRQS=y |
diff --git a/arch/mips/configs/rbhma4500_defconfig b/arch/mips/configs/rbhma4500_defconfig index 1cc145023584..9aaa43024aec 100644 --- a/arch/mips/configs/rbhma4500_defconfig +++ b/arch/mips/configs/rbhma4500_defconfig | |||
@@ -124,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
124 | # CONFIG_MIPS_MT is not set | 124 | # CONFIG_MIPS_MT is not set |
125 | CONFIG_CPU_ADVANCED=y | 125 | CONFIG_CPU_ADVANCED=y |
126 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
127 | CONFIG_CPU_HAS_LLDSCD=y | ||
128 | CONFIG_CPU_HAS_WB=y | 127 | CONFIG_CPU_HAS_WB=y |
129 | CONFIG_CPU_HAS_SYNC=y | 128 | CONFIG_CPU_HAS_SYNC=y |
130 | CONFIG_GENERIC_HARDIRQS=y | 129 | CONFIG_GENERIC_HARDIRQS=y |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 30975b305ae5..abf61095931e 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -124,7 +124,6 @@ CONFIG_PAGE_SIZE_4KB=y | |||
124 | # CONFIG_64BIT_PHYS_ADDR is not set | 124 | # CONFIG_64BIT_PHYS_ADDR is not set |
125 | # CONFIG_CPU_ADVANCED is not set | 125 | # CONFIG_CPU_ADVANCED is not set |
126 | CONFIG_CPU_HAS_LLSC=y | 126 | CONFIG_CPU_HAS_LLSC=y |
127 | CONFIG_CPU_HAS_LLDSCD=y | ||
128 | CONFIG_CPU_HAS_SYNC=y | 127 | CONFIG_CPU_HAS_SYNC=y |
129 | CONFIG_GENERIC_HARDIRQS=y | 128 | CONFIG_GENERIC_HARDIRQS=y |
130 | CONFIG_GENERIC_IRQ_PROBE=y | 129 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/sb1250-swarm_defconfig b/arch/mips/configs/sb1250-swarm_defconfig index 63f1be18e9bf..52048c906079 100644 --- a/arch/mips/configs/sb1250-swarm_defconfig +++ b/arch/mips/configs/sb1250-swarm_defconfig | |||
@@ -133,7 +133,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
133 | # CONFIG_MIPS_MT is not set | 133 | # CONFIG_MIPS_MT is not set |
134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y | 134 | CONFIG_SB1_PASS_1_WORKAROUNDS=y |
135 | CONFIG_CPU_HAS_LLSC=y | 135 | CONFIG_CPU_HAS_LLSC=y |
136 | CONFIG_CPU_HAS_LLDSCD=y | ||
137 | CONFIG_CPU_HAS_SYNC=y | 136 | CONFIG_CPU_HAS_SYNC=y |
138 | CONFIG_GENERIC_HARDIRQS=y | 137 | CONFIG_GENERIC_HARDIRQS=y |
139 | CONFIG_GENERIC_IRQ_PROBE=y | 138 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/configs/yosemite_defconfig b/arch/mips/configs/yosemite_defconfig index d51d5d16297c..468c2e443d71 100644 --- a/arch/mips/configs/yosemite_defconfig +++ b/arch/mips/configs/yosemite_defconfig | |||
@@ -118,7 +118,6 @@ CONFIG_CPU_HAS_PREFETCH=y | |||
118 | # CONFIG_64BIT_PHYS_ADDR is not set | 118 | # CONFIG_64BIT_PHYS_ADDR is not set |
119 | # CONFIG_CPU_ADVANCED is not set | 119 | # CONFIG_CPU_ADVANCED is not set |
120 | CONFIG_CPU_HAS_LLSC=y | 120 | CONFIG_CPU_HAS_LLSC=y |
121 | CONFIG_CPU_HAS_LLDSCD=y | ||
122 | CONFIG_CPU_HAS_SYNC=y | 121 | CONFIG_CPU_HAS_SYNC=y |
123 | CONFIG_GENERIC_HARDIRQS=y | 122 | CONFIG_GENERIC_HARDIRQS=y |
124 | CONFIG_GENERIC_IRQ_PROBE=y | 123 | CONFIG_GENERIC_IRQ_PROBE=y |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 2a1b844da43f..4f125e9e8e0b 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
@@ -123,7 +123,6 @@ CONFIG_IP22_CPU_SCACHE=y | |||
123 | # CONFIG_64BIT_PHYS_ADDR is not set | 123 | # CONFIG_64BIT_PHYS_ADDR is not set |
124 | # CONFIG_CPU_ADVANCED is not set | 124 | # CONFIG_CPU_ADVANCED is not set |
125 | CONFIG_CPU_HAS_LLSC=y | 125 | CONFIG_CPU_HAS_LLSC=y |
126 | CONFIG_CPU_HAS_LLDSCD=y | ||
127 | CONFIG_CPU_HAS_SYNC=y | 126 | CONFIG_CPU_HAS_SYNC=y |
128 | CONFIG_GENERIC_HARDIRQS=y | 127 | CONFIG_GENERIC_HARDIRQS=y |
129 | CONFIG_GENERIC_IRQ_PROBE=y | 128 | CONFIG_GENERIC_IRQ_PROBE=y |