Re: Assembler error in arch/mips/kernel/entry.S

[Thiemo Seufer <ica2_ts@csv.ica.uni-stuttgart.de>]

Jö Fahlke wrote:
[snip]
> ======================================================================
>         beqz    restore_all
>         if (in_exception_path)
>                 goto restore_all;
>         li      t0, PREEMPT_ACTIVE
> ======================================================================
> 
> Can someone please fix this?  My very limitet assembler knowledge
> gives me an idea whats wrong, but I don't know how to fix it.

The appended guesswork may help.


Thiemo


Index: entry.S
===================================================================
RCS file: /home/cvs/linux/arch/mips/kernel/entry.S,v
retrieving revision 1.58
diff -u -p -r1.58 entry.S
--- entry.S     30 Oct 2003 01:50:28 -0000      1.58
+++ entry.S     6 Jan 2004 18:11:23 -0000
@@ -52,9 +52,7 @@ ENTRY(resume_kernel)
 need_resched:
        LONG_L  t0, TI_FLAGS($28)
        andi    t1, t0, _TIF_NEED_RESCHED
-       beqz    restore_all
-       if (in_exception_path)
-               goto restore_all;
+       beqz    t1, restore_all
        li      t0, PREEMPT_ACTIVE
        sw      t0, TI_PRE_COUNT($28)
        local_irq_enable t0