linux-mips
[Top] [All Lists]

[PATCH] cleanup ret_from_exception

To: linux-mips@linux-mips.org
Subject: [PATCH] cleanup ret_from_exception
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Date: Tue, 27 Mar 2007 00:48:39 +0900 (JST)
Cc: ralf@linux-mips.org
Original-recipient: rfc822;linux-mips@linux-mips.org
Sender: linux-mips-bounce@linux-mips.org
Remove unnecessary local_irq_disable() from ret_from_exception.  The
local_irq_disable() came from preempt_stop macro which was removed by
recent cleanup.  And perhaps the preempt_stop macro had been wrong
since bf0b3bb876115b1e69b2266477128d8270d0b356.

This patch also cleanup __ret_from_irq which is not used now.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index 0b78fcb..6e4f766 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -22,20 +22,13 @@
 
 #ifndef CONFIG_PREEMPT
 #define resume_kernel  restore_all
-#else
-#define __ret_from_irq ret_from_exception
 #endif
 
        .text
        .align  5
-#ifndef CONFIG_PREEMPT
-FEXPORT(ret_from_exception)
-       local_irq_disable                       # preempt stop
-       b       __ret_from_irq
-#endif
 FEXPORT(ret_from_irq)
        LONG_S  s0, TI_REGS($28)
-FEXPORT(__ret_from_irq)
+FEXPORT(ret_from_exception)
        LONG_L  t0, PT_STATUS(sp)               # returning to kernel mode?
        andi    t0, t0, KU_USER
        beqz    t0, resume_kernel

<Prev in Thread] Current Thread [Next in Thread>
  • [PATCH] cleanup ret_from_exception, Atsushi Nemoto <=