Index: kernel/arch/arm32/include/mach/integratorcp/integratorcp.h
===================================================================
--- kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision d7ef14b00a909e507a2742d2e1d5a3af153b293a)
+++ kernel/arch/arm32/include/mach/integratorcp/integratorcp.h	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
@@ -103,5 +103,5 @@
 extern void icp_cpu_halt(void);
 extern void icp_irq_exception(unsigned int, istate_t *);
-extern uintptr_t icp_get_memory_size(void);
+extern void icp_get_memory_extents(uintptr_t *, uintptr_t *);
 extern void icp_frame_init(void);
 
Index: kernel/arch/arm32/include/mach/testarm/testarm.h
===================================================================
--- kernel/arch/arm32/include/mach/testarm/testarm.h	(revision d7ef14b00a909e507a2742d2e1d5a3af153b293a)
+++ kernel/arch/arm32/include/mach/testarm/testarm.h	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
@@ -73,5 +73,5 @@
 extern void gxemul_cpu_halt(void);
 extern void gxemul_irq_exception(unsigned int, istate_t *);
-extern uintptr_t gxemul_get_memory_size(void);
+extern void gxemul_get_memory_extents(uintptr_t *, uintptr_t *);
 extern void gxemul_frame_init(void);
 
Index: kernel/arch/arm32/src/mach/testarm/testarm.c
===================================================================
--- kernel/arch/arm32/src/mach/testarm/testarm.c	(revision d7ef14b00a909e507a2742d2e1d5a3af153b293a)
+++ kernel/arch/arm32/src/mach/testarm/testarm.c	(revision 12b0d51de9d4343bcc2d442e78f69a0a65d854e6)
@@ -190,8 +190,8 @@
  * @param size		Place to store memory size.
  */
-void gxemul_get_memory_size(uintptr_t *start, uintptr_t *size)
-{
-	start = 0;
-        size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
+void gxemul_get_memory_extents(uintptr_t *start, uintptr_t *size)
+{
+	*start = 0;
+        *size = *((uintptr_t *) (GXEMUL_MP_ADDRESS + GXEMUL_MP_MEMSIZE_OFFSET));
 }