Commit:     7da8a581f5ec0ecac5f0afc9ec26ce13b780d48d
Parent:     6f3aa38e191326a82d5dcae1f6cdc88b1d9a8d32
Author:     Franck Bui-Huu <[EMAIL PROTECTED]>
AuthorDate: Tue Feb 13 14:50:18 2007 +0100
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Feb 13 22:40:51 2007 +0000

    [MIPS] Make entry.S a little more readable.
    When CONFIG_PREEMPT is not set, it also moves one branch instruction from
    ret_from_irq() to ret_from_exception().  Therefore we favour the return
    from irq case which should be more common than the other one.
    Signed-off-by: Franck Bui-Huu <[EMAIL PROTECTED]>
    Acked-by: Atsushi Nemoto <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
 arch/mips/kernel/entry.S |   19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/arch/mips/kernel/entry.S b/arch/mips/kernel/entry.S
index f10b6a1..0b78fcb 100644
--- a/arch/mips/kernel/entry.S
+++ b/arch/mips/kernel/entry.S
@@ -21,24 +21,21 @@
-       .macro  preempt_stop
-       local_irq_disable
-       .endm
 #define resume_kernel  restore_all
+#define __ret_from_irq ret_from_exception
        .align  5
-       LONG_S  s0, TI_REGS($28)
-       b       _ret_from_irq
-       preempt_stop
+       local_irq_disable                       # preempt stop
+       b       __ret_from_irq
+       LONG_S  s0, TI_REGS($28)
        LONG_L  t0, PT_STATUS(sp)               # returning to kernel mode?
        andi    t0, t0, KU_USER
        beqz    t0, resume_kernel
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to