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/vm/vm_map.c b/vm/vm_map.c
index 67a24c27..dac3bc02 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -702,10 +702,12 @@ vm_map_init(struct vm_map *map, struct pmap *pmap,
 #ifdef CONFIG_SHELL
 
 static void
-vm_map_shell_info(int argc, char **argv)
+vm_map_shell_info(struct shell *shell, int argc, char **argv)
 {
     const struct task *task;
 
+    (void)shell;
+
     if (argc < 2) {
         goto error;
     } else {
@@ -733,7 +735,7 @@ static struct shell_cmd vm_map_shell_cmds[] = {
 static int __init
 vm_map_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(vm_map_shell_cmds);
+    SHELL_REGISTER_CMDS(vm_map_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }