Changeset 46c20c8 in mainline for kernel/arch/mips32/src/context.S


Ignore:
Timestamp:
2010-11-26T20:08:10Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
45df59a
Parents:
fb150d78 (diff), ffdd2b9 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/mips32/src/context.S

    rfb150d78 r46c20c8  
    2828
    2929#include <arch/context_offset.h>
    30        
    31 .text   
     30
     31.text
    3232
    3333.set noat
    … …  
    3838.global context_restore_arch
    3939
    40        
    4140context_save_arch:
    4241        CONTEXT_SAVE_ARCH_CORE $a0
    43 
     42       
    4443        # context_save returns 1
    4544        j $31
    46         li $2, 1       
    47        
     45        li $2, 1
     46
    4847context_restore_arch:
    4948        CONTEXT_RESTORE_ARCH_CORE $a0
    50 
     49       
    5150        # context_restore returns 0
    5251        j $31
    53         xor $2, $2     
     52        xor $2, $2
Note: See TracChangeset for help on using the changeset viewer.