Changeset 810a36f in mainline for kernel/arch/ia32/src/interrupt.c

Timestamp:

2017-10-24T05:29:08Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

File:

• kernel/arch/ia32/src/interrupt.c (modified) (1 diff)

kernel/arch/ia32/src/interrupt.c

@@ -88 +88 @@
             istate->esi, istate->edi, istate->ebp,
             istate_from_uspace(istate) ? istate->esp :
-            (uintptr_t) &istate->esp);
+            (uint32_t) &istate->esp);
 }