On Sat, May 11, 2013 at 06:57:25AM -0500, Robin Holt wrote:
> This patch prepares for the moving the parsing of reboot= to the generic
> kernel code by making reboot_mode into a more generic form.
> 
> Signed-off-by: Robin Holt <[email protected]>
> To: Andrew Morton <[email protected]>
> To: Russell King <[email protected]>
> Cc: Russ Anderson <[email protected]>
> Cc: Robin Holt <[email protected]>
> Cc: H. Peter Anvin <[email protected]>
> Cc: Guan Xuetao <[email protected]>
> Cc: Linux Kernel Mailing List <[email protected]>
> Cc: the arch/x86 maintainers <[email protected]>
> Cc: Arm Mailing List <[email protected]>

Almost-but-not-quite-Acked-by: Russell King <[email protected]> :)

> diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c
> index f219703..92b47df 100644
> --- a/arch/arm/kernel/process.c
> +++ b/arch/arm/kernel/process.c
> @@ -174,14 +174,14 @@ void arch_cpu_idle(void)
>               default_idle();
>  }
>  
> -static char reboot_mode = 'h';
> +enum reboot_mode reboot_mode = REBOOT_HARD;
>  
> -int __init reboot_setup(char *str)
> +static int __init reboot_setup(char *str)
>  {
> -     reboot_mode = str[0];
> +     if ('s' == str[0])
> +             reboot_mode = REBOOT_SOFT;

Remember we talked about the 'gpio' mode as well, so you also need here
+       if ('g' == str[0])
                reboot_mode = REBOOT_GPIO;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to