Changeset 96cd5b4 in mainline for kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

Timestamp:

2012-01-04T13:37:10Z (12 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

9957a97

Parents:

ecf823a (diff), c520034 (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 with mainline

File:

• kernel/arch/arm32/include/mach/integratorcp/integratorcp.h (modified) (1 diff)

kernel/arch/arm32/include/mach/integratorcp/integratorcp.h

@@ -103 +103 @@
 extern void icp_cpu_halt(void);
 extern void icp_irq_exception(unsigned int, istate_t *);
-extern void icp_get_memory_extents(uintptr_t *, uintptr_t *);
+extern void icp_get_memory_extents(uintptr_t *, size_t *);
 extern void icp_frame_init(void);
 extern size_t icp_get_irq_count(void);