1 files changed, 45 insertions, 12 deletions
diff --git a/vm/vm_page.c b/vm/vm_page.c
index dd17573c..b6753192 100644
--- a/vm/vm_page.c
+++ b/vm/vm_page.c
@@ -42,6 +42,7 @@
 #include <kern/mutex.h>
 #include <kern/panic.h>
 #include <kern/param.h>
+#include <kern/shell.h>
 #include <kern/thread.h>
 #include <machine/cpu.h>
 #include <machine/pmap.h>
@@ -634,6 +635,46 @@ vm_page_bootalloc(size_t size)
     panic("vm_page: no physical memory available");
 }
 
+static void
+vm_page_info_common(int (*print_fn)(const char *format, ...))
+{
+    struct vm_page_zone *zone;
+    unsigned long pages;
+    unsigned int i;
+
+    for (i = 0; i < vm_page_zones_size; i++) {
+        zone = &vm_page_zones[i];
+        pages = (unsigned long)(zone->pages_end - zone->pages);
+        print_fn("vm_page: %s: pages: %lu (%luM), free: %lu (%luM)\n",
+                 vm_page_zone_name(i), pages, pages >> (20 - PAGE_SHIFT),
+                 zone->nr_free_pages, zone->nr_free_pages >> (20 - PAGE_SHIFT));
+    }
+}
+
+#ifdef X15_SHELL
+
+static void
+vm_page_info(void)
+{
+    vm_page_info_common(printf);
+}
+
+static void
+vm_page_shell_info(int argc, char **argv)
+{
+    (void)argc;
+    (void)argv;
+    vm_page_info();
+}
+
+static struct shell_cmd vm_page_shell_cmds[] = {
+    SHELL_CMD_INITIALIZER("vm_page_info", vm_page_shell_info,
+        "vm_page_info",
+        "print information about physical memory"),
+};
+
+#endif /* X15_SHELL */
+
 void __init
 vm_page_setup(void)
 {
@@ -694,6 +735,8 @@ vm_page_setup(void)
     }
 
     vm_page_is_ready = 1;
+
+    SHELL_REGISTER_CMDS(vm_page_shell_cmds);
 }
 
 void __init
@@ -766,17 +809,7 @@ vm_page_zone_name(unsigned int zone_index)
 }
 
 void
-vm_page_info(void)
+vm_page_log_info(void)
 {
-    struct vm_page_zone *zone;
-    unsigned long pages;
-    unsigned int i;
-
-    for (i = 0; i < vm_page_zones_size; i++) {
-        zone = &vm_page_zones[i];
-        pages = (unsigned long)(zone->pages_end - zone->pages);
-        log_info("vm_page: %s: pages: %lu (%luM), free: %lu (%luM)",
-                 vm_page_zone_name(i), pages, pages >> (20 - PAGE_SHIFT),
-                 zone->nr_free_pages, zone->nr_free_pages >> (20 - PAGE_SHIFT));
-    }
+    vm_page_info_common(log_info);
 }