Changeset efdfebc in mainline for kernel/arch/arm32/include/istate.h

Timestamp:

2012-11-06T21:03:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/arm32/include/istate.h (modified) (1 diff)

kernel/arch/arm32/include/istate.h

@@ -49 +49 @@
 /** Struct representing CPU state saved when an exception occurs. */
 typedef struct istate {
+        uint32_t dummy;
         uint32_t spsr;
         uint32_t sp;