@@ -17,7 +17,7 @@ index c7d75807d13f..0992cad9c632 100644
1717 return cpu_wait == r4k_wait;
1818 }
1919diff --git a/arch/mips/kernel/genex.S b/arch/mips/kernel/genex.S
20- index 08c0a01d9a29 ..a572ce36a24f 100644
20+ index be1b049d856f ..a572ce36a24f 100644
2121--- a/arch/mips/kernel/genex.S
2222+++ b/arch/mips/kernel/genex.S
2323@@ -104,59 +104,48 @@ handle_vcei:
@@ -29,7 +29,7 @@ index 08c0a01d9a29..a572ce36a24f 100644
2929- .align 5
3030- LEAF(r4k_wait)
3131- /* Keep the ISA bit clear for calculations on local labels here. */
32- - 0: .fill 0
32+ - 0: .fill 0
3333- /* Start of idle interrupt region. */
3434- local_irq_enable
3535- /*
@@ -41,7 +41,7 @@ index 08c0a01d9a29..a572ce36a24f 100644
4141- */
4242- 1: .fill 0
4343- /* The R2 EI/EHB sequence takes 8 bytes, otherwise pad up. */
44- - .if 1b - 0b > 32
44+ - .if 1b - 0b > 32
4545- .error "overlong idle interrupt region"
4646- .elseif 1b - 0b > 8
4747- .align 4
@@ -91,13 +91,13 @@ index 08c0a01d9a29..a572ce36a24f 100644
9191 MFC0 k0, CP0_EPC
9292- /* Subtract/add 2 to let the ISA bit propagate through the mask. */
9393- PTR_LA k1, r4k_wait_insn - 2
94- - ori k0, r4k_wait_idle_size - 2
94+ - ori k0, r4k_wait_idle_size - 2
9595- .set noreorder
9696+ PTR_LA k1, __r4k_wait
9797+ ori k0, 0x1f /* 32 byte rollback region */
9898+ xori k0, 0x1f
9999 bne k0, k1, \handler
100- - PTR_ADDIU k0, r4k_wait_exit - r4k_wait_insn + 2
100+ - PTR_ADDIU k0, r4k_wait_exit - r4k_wait_insn + 2
101101- .set reorder
102102 MTC0 k0, CP0_EPC
103103 .set pop
@@ -136,28 +136,6 @@ index 80e8a04a642e..5abc8b7340f8 100644
136136 /*
137137 * This variant is preferable as it allows testing need_resched and going to
138138 * sleep depending on the outcome atomically. Unfortunately the "It is
139- diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c
140- index cc26d56f3ab6..e85bd087467e 100644
141- --- a/arch/mips/kernel/smp-cps.c
142- +++ b/arch/mips/kernel/smp-cps.c
143- @@ -332,8 +332,6 @@ static void __init cps_prepare_cpus(unsigned int max_cpus)
144- mips_cps_cluster_bootcfg = kcalloc(nclusters,
145- sizeof(*mips_cps_cluster_bootcfg),
146- GFP_KERNEL);
147- - if (!mips_cps_cluster_bootcfg)
148- - goto err_out;
149-
150- if (nclusters > 1)
151- mips_cm_update_property();
152- @@ -350,8 +348,6 @@ static void __init cps_prepare_cpus(unsigned int max_cpus)
153- mips_cps_cluster_bootcfg[cl].core_power =
154- kcalloc(BITS_TO_LONGS(ncores), sizeof(unsigned long),
155- GFP_KERNEL);
156- - if (!mips_cps_cluster_bootcfg[cl].core_power)
157- - goto err_out;
158-
159- /* Allocate VPE boot configuration structs */
160- for (c = 0; c < ncores; c++) {
161139diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
162140index 8ec1e185b35c..39e248d0ed59 100644
163141--- a/arch/mips/kernel/traps.c
0 commit comments