lkml.org 
[lkml]   [2009]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
Subject[PATCH] init/main.c: fix symbol shadows noise
Date
From
The symbol 'call' is a static symbol used for initcall_debug.  This
same symbol name is used locally by a couple functions and produces
the following sparse warnings:

warning: symbol 'call' shadows an earlier one

Fix this noise by renaming the local symbols.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>

---

diff --git a/init/main.c b/init/main.c
index 7449819..19e564a 100644
--- a/init/main.c
+++ b/init/main.c
@@ -696,10 +696,10 @@ asmlinkage void __init start_kernel(void)
static void __init do_ctors(void)
{
#ifdef CONFIG_CONSTRUCTORS
- ctor_fn_t *call = (ctor_fn_t *) __ctors_start;
+ ctor_fn_t *fn = (ctor_fn_t *) __ctors_start;

- for (; call < (ctor_fn_t *) __ctors_end; call++)
- (*call)();
+ for (; fn < (ctor_fn_t *) __ctors_end; fn++)
+ (*fn)();
#endif
}

@@ -760,10 +760,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[];

static void __init do_initcalls(void)
{
- initcall_t *call;
+ initcall_t *fn;

- for (call = __early_initcall_end; call < __initcall_end; call++)
- do_one_initcall(*call);
+ for (fn = __early_initcall_end; fn < __initcall_end; fn++)
+ do_one_initcall(*fn);

/* Make sure there is no pending stuff from the initcall sequence */
flush_scheduled_work();
@@ -791,10 +791,10 @@ static void __init do_basic_setup(void)

static void __init do_pre_smp_initcalls(void)
{
- initcall_t *call;
+ initcall_t *fn;

- for (call = __initcall_start; call < __early_initcall_end; call++)
- do_one_initcall(*call);
+ for (fn = __initcall_start; fn < __early_initcall_end; fn++)
+ do_one_initcall(*fn);
}

static void run_init_process(char *init_filename)

\
 
 \ /
  Last update: 2009-10-07 02:45    [W:0.050 / U:0.460 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site