Changeset 65737d4 in mainline for kernel/arch/ia64/include/interrupt.h

Timestamp:

2010-01-13T20:39:42Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

711e1f32

Parents:

9245413 (diff), fd608dc (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/ia64/include/interrupt.h (modified) (2 diffs)

kernel/arch/ia64/include/interrupt.h

@@ -72 +72 @@
 #define EOI  0  /**< The actual value doesn't matter. */
 
-typedef struct {
+typedef struct istate {
         uint128_t f2;
         uint128_t f3;
@@ -143 +143 @@
 }
 
+static inline unative_t istate_get_fp(istate_t *istate)
+{
+        return 0;       /* FIXME */
+}
+
 static inline int istate_from_uspace(istate_t *istate)
 {