* [PATCH] MIPS: Remove confusing else statement in __do_page_fault()
@ 2017-03-30 21:27 Paul Burton
2017-03-30 21:27 ` Paul Burton
2017-04-12 22:48 ` Ralf Baechle
0 siblings, 2 replies; 3+ messages in thread
From: Paul Burton @ 2017-03-30 21:27 UTC (permalink / raw)
To: Ralf Baechle, linux-mips; +Cc: Paul Burton, trivial
Commit 41c594ab65fc ("[MIPS] MT: Improved multithreading support.")
added an else case to an if statement in do_page_fault() (which has
since gained 2 leading underscores) for some unclear reason. If the
condition in the if statement evaluates true then we execute a goto &
branch elsewhere anyway, so the else has no effect. Combined with an #if
0 block with misleading indentation introduced in the same commit it
makes the code less clear than it could be.
Remove the unnecessary else statement & de-indent the printk within
the #if 0 block in order to make the code easier for humans to parse.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: trivial@kernel.org
---
arch/mips/mm/fault.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 3bef306cdfdb..4f8f5bf46977 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -267,19 +267,19 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))
goto no_context;
- else
+
/*
* Send a sigbus, regardless of whether we were in kernel
* or user mode.
*/
#if 0
- printk("do_page_fault() #3: sending SIGBUS to %s for "
- "invalid %s\n%0*lx (epc == %0*lx, ra == %0*lx)\n",
- tsk->comm,
- write ? "write access to" : "read access from",
- field, address,
- field, (unsigned long) regs->cp0_epc,
- field, (unsigned long) regs->regs[31]);
+ printk("do_page_fault() #3: sending SIGBUS to %s for "
+ "invalid %s\n%0*lx (epc == %0*lx, ra == %0*lx)\n",
+ tsk->comm,
+ write ? "write access to" : "read access from",
+ field, address,
+ field, (unsigned long) regs->cp0_epc,
+ field, (unsigned long) regs->regs[31]);
#endif
current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;
tsk->thread.cp0_badvaddr = address;
--
2.12.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH] MIPS: Remove confusing else statement in __do_page_fault()
2017-03-30 21:27 [PATCH] MIPS: Remove confusing else statement in __do_page_fault() Paul Burton
@ 2017-03-30 21:27 ` Paul Burton
2017-04-12 22:48 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Paul Burton @ 2017-03-30 21:27 UTC (permalink / raw)
To: Ralf Baechle, linux-mips; +Cc: Paul Burton, trivial
Commit 41c594ab65fc ("[MIPS] MT: Improved multithreading support.")
added an else case to an if statement in do_page_fault() (which has
since gained 2 leading underscores) for some unclear reason. If the
condition in the if statement evaluates true then we execute a goto &
branch elsewhere anyway, so the else has no effect. Combined with an #if
0 block with misleading indentation introduced in the same commit it
makes the code less clear than it could be.
Remove the unnecessary else statement & de-indent the printk within
the #if 0 block in order to make the code easier for humans to parse.
Signed-off-by: Paul Burton <paul.burton@imgtec.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: trivial@kernel.org
---
arch/mips/mm/fault.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 3bef306cdfdb..4f8f5bf46977 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -267,19 +267,19 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,
/* Kernel mode? Handle exceptions or die */
if (!user_mode(regs))
goto no_context;
- else
+
/*
* Send a sigbus, regardless of whether we were in kernel
* or user mode.
*/
#if 0
- printk("do_page_fault() #3: sending SIGBUS to %s for "
- "invalid %s\n%0*lx (epc == %0*lx, ra == %0*lx)\n",
- tsk->comm,
- write ? "write access to" : "read access from",
- field, address,
- field, (unsigned long) regs->cp0_epc,
- field, (unsigned long) regs->regs[31]);
+ printk("do_page_fault() #3: sending SIGBUS to %s for "
+ "invalid %s\n%0*lx (epc == %0*lx, ra == %0*lx)\n",
+ tsk->comm,
+ write ? "write access to" : "read access from",
+ field, address,
+ field, (unsigned long) regs->cp0_epc,
+ field, (unsigned long) regs->regs[31]);
#endif
current->thread.trap_nr = (regs->cp0_cause >> 2) & 0x1f;
tsk->thread.cp0_badvaddr = address;
--
2.12.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] MIPS: Remove confusing else statement in __do_page_fault()
2017-03-30 21:27 [PATCH] MIPS: Remove confusing else statement in __do_page_fault() Paul Burton
2017-03-30 21:27 ` Paul Burton
@ 2017-04-12 22:48 ` Ralf Baechle
1 sibling, 0 replies; 3+ messages in thread
From: Ralf Baechle @ 2017-04-12 22:48 UTC (permalink / raw)
To: Paul Burton; +Cc: linux-mips, trivial
On Thu, Mar 30, 2017 at 02:27:02PM -0700, Paul Burton wrote:
> Commit 41c594ab65fc ("[MIPS] MT: Improved multithreading support.")
> added an else case to an if statement in do_page_fault() (which has
> since gained 2 leading underscores) for some unclear reason. If the
> condition in the if statement evaluates true then we execute a goto &
> branch elsewhere anyway, so the else has no effect. Combined with an #if
> 0 block with misleading indentation introduced in the same commit it
> makes the code less clear than it could be.
>
> Remove the unnecessary else statement & de-indent the printk within
> the #if 0 block in order to make the code easier for humans to parse.
Yuck ...
Applied. Thanks!
Ralf
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-04-12 22:48 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-30 21:27 [PATCH] MIPS: Remove confusing else statement in __do_page_fault() Paul Burton
2017-03-30 21:27 ` Paul Burton
2017-04-12 22:48 ` Ralf Baechle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).