[<prev] [next>] [day] [month] [year] [list]
Message-ID: <alpine.DEB.2.21.2510191229030.39634@angie.orcam.me.uk>
Date: Sun, 19 Oct 2025 12:49:02 +0100 (BST)
From: "Maciej W. Rozycki" <macro@...am.me.uk>
To: Thomas Bogendoerfer <tsbogend@...ha.franken.de>
cc: Marco Crivellari <marco.crivellari@...e.com>,
Frederic Weisbecker <frederic@...nel.org>, linux-mips@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: [PATCH] MIPS: Fix whitespace damage in r4k_wait from VS timer fix
Remove stray spaces/tabs introduced with commit 56651128e2fb ("MIPS: Fix
idle VS timer enqueue") and add missing indentation for a branch delay
slot.
Signed-off-by: Maciej W. Rozycki <macro@...am.me.uk>
---
It would have been caught, for the most issues, with:
whitespace = indent-with-non-tab,space-before-tab,trailing-space
in git configuration. Is there a way to get it propagated with checkouts?
---
arch/mips/kernel/genex.S | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
linux-mips-idle-vs-timer-format.diff
Index: linux-macro/arch/mips/kernel/genex.S
===================================================================
--- linux-macro.orig/arch/mips/kernel/genex.S
+++ linux-macro/arch/mips/kernel/genex.S
@@ -109,7 +109,7 @@ NESTED(except_vec3_r4000, 0, sp)
.align 5
LEAF(r4k_wait)
/* Keep the ISA bit clear for calculations on local labels here. */
-0: .fill 0
+0: .fill 0
/* Start of idle interrupt region. */
local_irq_enable
/*
@@ -121,7 +121,7 @@ LEAF(r4k_wait)
*/
1: .fill 0
/* The R2 EI/EHB sequence takes 8 bytes, otherwise pad up. */
- .if 1b - 0b > 32
+ .if 1b - 0b > 32
.error "overlong idle interrupt region"
.elseif 1b - 0b > 8
.align 4
@@ -146,10 +146,10 @@ LEAF(r4k_wait)
MFC0 k0, CP0_EPC
/* Subtract/add 2 to let the ISA bit propagate through the mask. */
PTR_LA k1, r4k_wait_insn - 2
- ori k0, r4k_wait_idle_size - 2
+ ori k0, r4k_wait_idle_size - 2
.set noreorder
bne k0, k1, \handler
- PTR_ADDIU k0, r4k_wait_exit - r4k_wait_insn + 2
+ PTR_ADDIU k0, r4k_wait_exit - r4k_wait_insn + 2
.set reorder
MTC0 k0, CP0_EPC
.set pop
Powered by blists - more mailing lists