Changeset 46c20c8 in mainline for kernel/arch/ppc32/src/exception.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/ppc32/src/exception.S

    rfb150d78 r46c20c8  
    2828
    2929#include <arch/asm/regname.h>
     30#include <arch/cpu.h>
    3031#include <arch/mm/page.h>
    3132
    … …  
    3435.macro CONTEXT_STORE
    3536       
    36         # save R12 in SPRG1, backup CR in R12
     37        # save r12 in SPRG1, backup CR in r12
    3738        # save SP in SPRG2
    38 
     39       
    3940        mtsprg1 r12
    4041        mfcr r12
    … …  
    288289       
    289290        mfmsr r12
    290         ori r12, r12, (msr_ir | msr_dr)@l
     291        ori r12, r12, (MSR_IR | MSR_DR)@l
    291292        mtsrr1 r12
    292293       
    … …  
    307308       
    308309        mfmsr r12
    309         ori r12, r12, (msr_ir | msr_dr)@l
     310        ori r12, r12, (MSR_IR | MSR_DR)@l
    310311        mtsrr1 r12
    311312       
Note: See TracChangeset for help on using the changeset viewer.