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/syscnt.c b/kern/syscnt.c
index e0b213d7..1fd3cf06 100644
--- a/kern/syscnt.c
+++ b/kern/syscnt.c
@@ -36,10 +36,12 @@ static struct mutex syscnt_lock;
 #ifdef CONFIG_SHELL
 
 static void
-syscnt_shell_info(int argc, char **argv)
+syscnt_shell_info(struct shell *shell, int argc, char **argv)
 {
     char *prefix;
 
+    (void)shell;
+
     prefix = (argc >= 2) ? argv[1] : NULL;
     syscnt_info(prefix);
 }
@@ -53,7 +55,7 @@ static struct shell_cmd syscnt_shell_cmds[] = {
 static int __init
 syscnt_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(syscnt_shell_cmds);
+    SHELL_REGISTER_CMDS(syscnt_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }