From 82ae6d7458e5bba18c1d9d72c890b05fb4b506f0 Mon Sep 17 00:00:00 2001
From: Balazs Gerofi <bgerofi@riken.jp>
Date: Thu, 18 Aug 2016 14:52:05 +0900
Subject: [PATCH] query_free_mem_interrupt_handler(): report number of free
 pages as kmsg

---
 kernel/mem.c     | 13 +++++++++----
 kernel/syscall.c |  8 ++++----
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/kernel/mem.c b/kernel/mem.c
index fc8f109d..c267f33c 100644
--- a/kernel/mem.c
+++ b/kernel/mem.c
@@ -156,13 +156,18 @@ void sbox_write(int offset, unsigned int value);
 
 static void query_free_mem_interrupt_handler(void *priv)
 {
-#ifdef ATTACHED_MIC
-	dkprintf("query free mem handler!\n");
-
+	extern int runcount;
 	int pages = ihk_pagealloc_query_free(pa_allocator);
 	
-	dkprintf("free pages: %d\n", pages);
+	kprintf("McKernel free pages: %d\n", pages);
 
+	if (find_command_line("memdebug")) {
+		memcheckall();
+		freecheck(runcount);
+		runcount++;
+	}
+
+#ifdef ATTACHED_MIC
 	sbox_write(SBOX_SCRATCH0, pages);
 	sbox_write(SBOX_SCRATCH1, 1);
 #endif
diff --git a/kernel/syscall.c b/kernel/syscall.c
index 9688f871..b3279588 100644
--- a/kernel/syscall.c
+++ b/kernel/syscall.c
@@ -1201,10 +1201,10 @@ do_mmap(const intptr_t addr0, const size_t len0, const int prot,
 	error = add_process_memory_range(thread->vm, addr, addr+len, phys,
 			vrflags, memobj, off, pgshift);
 	if (error) {
-		ekprintf("do_mmap:add_process_memory_range"
-				"(%p,%lx,%lx,%lx,%lx,%d) failed %d\n",
-				thread->vm, addr, addr+len,
-				virt_to_phys(p), vrflags, pgshift, error);
+		kprintf("%s: add_process_memory_range failed for 0x%lx:%lu"
+				" flags: %lx, vrflags: %lx, pgshift: %d, error: %d\n",
+				__FUNCTION__, addr, addr+len,
+				flags, vrflags, pgshift, error);
 		goto out;
 	}