kern/{fmt,shell}: update from upstream

The shell module has been "objectified" and now supports multiple
instances with shareable command sets.

1 files changed, 4 insertions, 2 deletions

diff --git a/kern/kmem.c b/kern/kmem.c
index 8856292b..bd2e1d56 100644
--- a/kern/kmem.c
+++ b/kern/kmem.c
@@ -1168,10 +1168,12 @@ out:
 }
 
 static void
-kmem_shell_info(int argc, char **argv)
+kmem_shell_info(struct shell *shell, int argc, char **argv)
 {
     struct kmem_cache *cache;
 
+    (void)shell;
+
     if (argc < 2) {
         kmem_info();
     } else {
@@ -1195,7 +1197,7 @@ static struct shell_cmd kmem_shell_cmds[] = {
 static int __init
 kmem_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(kmem_shell_cmds);
+    SHELL_REGISTER_CMDS(kmem_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }