kern/{fmt,shell}: update from upstream

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

1 files changed, 5 insertions, 3 deletions

diff --git a/kern/shutdown.c b/kern/shutdown.c
index 510911fe..57eb66e4 100644
--- a/kern/shutdown.c
+++ b/kern/shutdown.c
@@ -29,8 +29,9 @@ static struct plist shutdown_ops_list;
 #ifdef CONFIG_SHELL
 
 static void
-shutdown_shell_halt(int argc, char **argv)
+shutdown_shell_halt(struct shell *shell, int argc, char **argv)
 {
+    (void)shell;
     (void)argc;
     (void)argv;
 
@@ -38,8 +39,9 @@ shutdown_shell_halt(int argc, char **argv)
 }
 
 static void
-shutdown_shell_reboot(int argc, char **argv)
+shutdown_shell_reboot(struct shell *shell, int argc, char **argv)
 {
+    (void)shell;
     (void)argc;
     (void)argv;
 
@@ -58,7 +60,7 @@ static struct shell_cmd shutdown_shell_cmds[] = {
 static int __init
 shutdown_setup_shell(void)
 {
-    SHELL_REGISTER_CMDS(shutdown_shell_cmds);
+    SHELL_REGISTER_CMDS(shutdown_shell_cmds, shell_get_main_cmd_set());
     return 0;
 }