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

Timestamp:

2011-08-03T17:34:57Z (15 years ago)

Author:

Oleg Romanenko <romanenko.oleg@…>

Branches:

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

Children:

1940326

Parents:

52a79081 (diff), 3fab770 (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 from 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;
 }