2012-06-09 17:06:49

by Matthew Shaw

[permalink] [raw]
Subject: [PATCH] init: main: Corrected some coding style issues.

diff --git a/init/main.c b/init/main.c
index 1ca6b32..66125f0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -6,7 +6,7 @@
* GK 2/5/95 - Changed to support mounting root fs via NFS
* Added initrd & change_root: Werner Almesberger & Hans Lermen, Feb '96
* Moan early if gcc is old, avoiding bogus kernels - Paul Gortmaker, May '96
- * Simplified starting of init: Michael A. Griffith <[email protected]>
+ * Simplified starting of init: Michael A. Griffith <[email protected]>
*/

#include <linux/types.h>
@@ -148,8 +148,8 @@ static int __init set_reset_devices(char *str)

__setup("reset_devices", set_reset_devices);

-static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
-const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
+static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
+const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
static const char *panic_later, *panic_param;

extern const struct obs_kernel_param __setup_start[], __setup_end[];
@@ -464,7 +464,7 @@ static void __init mm_init(void)

asmlinkage void __init start_kernel(void)
{
- char * command_line;
+ char *command_line;
extern const struct kernel_param __start___param[], __stop___param[];

/*
@@ -838,7 +838,7 @@ static noinline int init_post(void)
"See Linux Documentation/init.txt for guidance.");
}

-static int __init kernel_init(void * unused)
+static int __init kernel_init(void *unused)
{
/*
* Wait until kthreadd is all set-up.
--
1.7.9.5


2012-06-10 06:38:36

by Rusty Russell

[permalink] [raw]
Subject: Re: [PATCH] init: main: Corrected some coding style issues.

On Sat, 9 Jun 2012 18:06:15 +0100, Matthew Shaw <[email protected]> wrote:
> diff --git a/init/main.c b/init/main.c
> index 1ca6b32..66125f0 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -6,7 +6,7 @@
> * GK 2/5/95 - Changed to support mounting root fs via NFS
> * Added initrd & change_root: Werner Almesberger & Hans Lermen, Feb '96
> * Moan early if gcc is old, avoiding bogus kernels - Paul Gortmaker, May '96
> - * Simplified starting of init: Michael A. Griffith <[email protected]>
> + * Simplified starting of init: Michael A. Griffith <[email protected]>
> */
>
> #include <linux/types.h>
> @@ -148,8 +148,8 @@ static int __init set_reset_devices(char *str)
>
> __setup("reset_devices", set_reset_devices);
>
> -static const char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
> -const char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
> +static const char *argv_init[MAX_INIT_ARGS+2] = { "init", NULL, };
> +const char *envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, };
> static const char *panic_later, *panic_param;
>
> extern const struct obs_kernel_param __setup_start[], __setup_end[];
> @@ -464,7 +464,7 @@ static void __init mm_init(void)
>
> asmlinkage void __init start_kernel(void)
> {
> - char * command_line;
> + char *command_line;
> extern const struct kernel_param __start___param[], __stop___param[];
>
> /*
> @@ -838,7 +838,7 @@ static noinline int init_post(void)
> "See Linux Documentation/init.txt for guidance.");
> }
>
> -static int __init kernel_init(void * unused)
> +static int __init kernel_init(void *unused)
> {
> /*
> * Wait until kthreadd is all set-up.

Please send to the trivial patch monkey.

Thanks,
Rusty.