From d3e43f5bfda0bdad7a829a7ed8c1272a395b196b Mon Sep 17 00:00:00 2001
From: Richard Braun <rbraun@sceen.net>
Date: Wed, 25 Jul 2018 01:16:24 +0200
Subject: kern/{fmt,shell}: update from upstream

The shell module has been "objectified" and now supports multiple
instances with shareable command sets.
---
 kern/task.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'kern/task.c')

diff --git a/kern/task.c b/kern/task.c
index aaa30f44..ebdb021e 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -62,11 +62,13 @@ task_init(struct task *task, const char *name, struct vm_map *map)
 #ifdef CONFIG_SHELL
 
 static void
-task_shell_info(int argc, char *argv[])
+task_shell_info(struct shell *shell, int argc, char *argv[])
 {
     struct task *task;
     int error;
 
+    (void)shell;
+
     if (argc == 1) {
         task_info(NULL);
         return;
@@ -97,7 +99,7 @@ static struct shell_cmd task_shell_cmds[] = {
 static int __init
 task_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(task_shell_cmds);
+    SHELL_REGISTER_CMDS(task_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }
 
-- 
cgit v1.2.3