Changeset 1564c4b in mainline for kernel/arch/ppc32/include/istate.h

Timestamp:

2011-06-08T19:39:52Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

2af29ed

Parents:

e686889c (diff), 0eff68e (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

File:

• kernel/arch/ppc32/include/istate.h (modified) (2 diffs)

kernel/arch/ppc32/include/istate.h

@@ -73 +73 @@
         uint32_t cr;
         uint32_t pc;
-        uint32_t srr1;
+        uint32_t msr;
         uint32_t lr;
         uint32_t ctr;
@@ -90 +90 @@
 /** Return true if exception happened while in userspace
  *
- * The contexts of MSR register was stored in SRR1.
- *
  */
 NO_TRACE static inline int istate_from_uspace(istate_t *istate)
 {
-        return (istate->srr1 & MSR_PR) != 0;
+        return (istate->msr & MSR_PR) != 0;
 }