Changeset 6843a9c in mainline for kernel/arch/arm32/src/machine_func.c

Timestamp:

2012-06-29T13:02:14Z (13 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

722912e

Parents:

ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:

• kernel/arch/arm32/src/machine_func.c (modified) (1 diff)

kernel/arch/arm32/src/machine_func.c

@@ -85 +85 @@
  * @param size          Place to store memory size.
  */
-void machine_get_memory_extents(uintptr_t *start, uintptr_t *size)
+void machine_get_memory_extents(uintptr_t *start, size_t *size)
 {
         (machine_ops->machine_get_memory_extents)(start, size);