lkml.org 
[lkml]   [2012]   [Jun]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] init: add comments to keep initcall-names in sync with initcall levels
From
Date
On Thu, 2012-06-14 at 12:51 -0600, Jim Cromie wrote:
> main.c has initcall_level_names[] for parse_args to print in debug messages,
> add comments to keep them in sync with initcalls defined in init.h.
> Also tweak comment re not using *_initcall macros in loadable modules.
>
> Signed-off-by: Jim Cromie <jim.cromie@gmail.com>
> ---
> include/linux/init.h | 3 ++-
> init/main.c | 1 +
> 2 files changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/include/linux/init.h b/include/linux/init.h
> index 6b95109..da6f6f9 100644
> --- a/include/linux/init.h
> +++ b/include/linux/init.h
> @@ -191,6 +191,7 @@ extern bool initcall_debug;
> * initializes variables that couldn't be statically initialized.
> *
> * This only exists for built-in code, not for modules.
> + * Keep main.c:initcall_level_names[] in sync. */
> */

This comment now ends with "*/" twice. Perhaps that's legal (I haven't
even bothered to check) but it is really too ugly.

> #define pure_initcall(fn) __define_initcall("0",fn,0)
>
> @@ -280,7 +281,7 @@ void __init parse_early_options(char *cmdline);
>
> #else /* MODULE */
>
> -/* Don't use these in modules, but some people do... */
> +/* Don't use these in loadable modules, but some people do... */

What problem does this solve?

> #define early_initcall(fn) module_init(fn)
> #define core_initcall(fn) module_init(fn)
> #define postcore_initcall(fn) module_init(fn)
> diff --git a/init/main.c b/init/main.c
> index b5cc0a7..7a74087 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -724,6 +724,7 @@ static initcall_t *initcall_levels[] __initdata = {
> __initcall_end,
> };
>
> +/* Keep these in sync with initcalls in include/linux/init.h */
> static char *initcall_level_names[] __initdata = {
> "early",
> "core",


Paul Bolle



\
 
 \ /
  Last update: 2012-06-14 22:01    [W:0.103 / U:0.140 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site