Index: kernel/arch/mips32/include/mm/memory_init.h
===================================================================
--- kernel/arch/mips32/include/mm/memory_init.h	(revision b5ed4f8617310b06cf9b34a72a976bd4eaad6a71)
+++ 	(revision )
@@ -1,48 +1,0 @@
-/*
- * Copyright (c) 2005 Jakub Jermar
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * - Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * - Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- * - The name of the author may not be used to endorse or promote products
- *   derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/** @addtogroup mips32mm	
- * @{
- */
-/** @file
- */
-
-#ifndef KERN_mips32_MEMORY_INIT_H_
-#define KERN_mips32_MEMORY_INIT_H_
-
-#include <config.h>
-
-/* When this function is called, we do not have ARC initiated
- * - provide some reasonable minimum and update it later
- */
-#define get_memory_size()	CONFIG_MEMORY_SIZE
-
-#endif
-
-/** @}
- */
Index: kernel/arch/mips32/src/drivers/arc.c
===================================================================
--- kernel/arch/mips32/src/drivers/arc.c	(revision b5ed4f8617310b06cf9b34a72a976bd4eaad6a71)
+++ kernel/arch/mips32/src/drivers/arc.c	(revision 71eef11b8afe2eec0d0ac48ea6fce51144cb5b0c)
@@ -221,5 +221,5 @@
 		}	
 	} else
-		printf("%#10x %#10x free\n", 0, config.memory_size);
+		printf("%#10x %#10x free\n", 0, CONFIG_MEMORY_SIZE);
 }
 
@@ -363,5 +363,4 @@
 	if (arc_enabled()) {
 		arc_memdescriptor_t *desc;
-		int total = 0;
 		uintptr_t base;
 		size_t basesize;
@@ -380,6 +379,4 @@
 				basesize = ALIGN_DOWN(basesize, FRAME_SIZE);
 	
-				total += basesize;
-				
 				zone_create(ADDR2PFN(base), SIZE2FRAMES(basesize),
 					    ADDR2PFN(base), 0);
@@ -388,5 +385,4 @@
 		}
 	
-		config.memory_size = total;
 		return true;
 	}
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision b5ed4f8617310b06cf9b34a72a976bd4eaad6a71)
+++ kernel/arch/mips32/src/mm/frame.c	(revision 71eef11b8afe2eec0d0ac48ea6fce51144cb5b0c)
@@ -47,5 +47,5 @@
 {
 	if (!arc_frame_init()) {
-		zone_create(0, ADDR2PFN(config.memory_size), 1, 0);
+		zone_create(0, ADDR2PFN(CONFIG_MEMORY_SIZE), 1, 0);
 		/*
 		 * Blacklist interrupt vector