From d3e43f5bfda0bdad7a829a7ed8c1272a395b196b Mon Sep 17 00:00:00 2001 From: Richard Braun 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/shutdown.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'kern/shutdown.c') 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; } -- cgit v1.2.3