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/log.c b/kern/log.c
index 55578955..f20f966b 100644
--- a/kern/log.c
+++ b/kern/log.c
@@ -380,11 +380,13 @@ log_dump(unsigned int level)
 }
 
 static void
-log_shell_dump(int argc, char **argv)
+log_shell_dump(struct shell *shell, int argc, char **argv)
 {
     unsigned int level;
     int ret;
 
+    (void)shell;
+
     if (argc != 2) {
         level = log_print_level;
     } else {
@@ -418,7 +420,7 @@ static struct shell_cmd log_shell_cmds[] = {
 static int __init
 log_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(log_shell_cmds);
+    SHELL_REGISTER_CMDS(log_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }