Changeset 61c0402 in mainline for kernel/arch/mips32/include/exception.h

Timestamp:

2010-01-15T19:36:53Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

92bee46

Parents:

50f9c3a (diff), 963462af (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:

• kernel/arch/mips32/include/exception.h (modified) (2 diffs)

kernel/arch/mips32/include/exception.h

@@ -58 +58 @@
 #define EXC_VCED        31
 
-typedef struct {
+typedef struct istate {
         uint32_t at;
         uint32_t v0;
@@ -102 +102 @@
         return istate->epc;
 }
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
 
 extern void exception(istate_t *istate);