diff options
| author | H Hartley Sweeten <hartleys@visionengravers.com> | 2009-12-14 21:00:18 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-15 11:53:26 -0500 |
| commit | 196a15b4ee99f627fbc2c07e58e14aab2065fa80 (patch) | |
| tree | 6886bf8387be37fac4cd4b9b1e0e8109a8adf155 /init | |
| parent | 4d00928c1f02defc81afcc5cc6198581c4bd03e8 (diff) | |
init/main.c: fix symbol shadows noise
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>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'init')
| -rw-r--r-- | init/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/init/main.c b/init/main.c index 4051d75dd2d6..c3db4a98b369 100644 --- a/init/main.c +++ b/init/main.c | |||
| @@ -691,10 +691,10 @@ asmlinkage void __init start_kernel(void) | |||
| 691 | static void __init do_ctors(void) | 691 | static void __init do_ctors(void) |
| 692 | { | 692 | { |
| 693 | #ifdef CONFIG_CONSTRUCTORS | 693 | #ifdef CONFIG_CONSTRUCTORS |
| 694 | ctor_fn_t *call = (ctor_fn_t *) __ctors_start; | 694 | ctor_fn_t *fn = (ctor_fn_t *) __ctors_start; |
| 695 | 695 | ||
| 696 | for (; call < (ctor_fn_t *) __ctors_end; call++) | 696 | for (; fn < (ctor_fn_t *) __ctors_end; fn++) |
| 697 | (*call)(); | 697 | (*fn)(); |
| 698 | #endif | 698 | #endif |
| 699 | } | 699 | } |
| 700 | 700 | ||
| @@ -755,10 +755,10 @@ extern initcall_t __initcall_start[], __initcall_end[], __early_initcall_end[]; | |||
| 755 | 755 | ||
| 756 | static void __init do_initcalls(void) | 756 | static void __init do_initcalls(void) |
| 757 | { | 757 | { |
| 758 | initcall_t *call; | 758 | initcall_t *fn; |
| 759 | 759 | ||
| 760 | for (call = __early_initcall_end; call < __initcall_end; call++) | 760 | for (fn = __early_initcall_end; fn < __initcall_end; fn++) |
| 761 | do_one_initcall(*call); | 761 | do_one_initcall(*fn); |
| 762 | 762 | ||
| 763 | /* Make sure there is no pending stuff from the initcall sequence */ | 763 | /* Make sure there is no pending stuff from the initcall sequence */ |
| 764 | flush_scheduled_work(); | 764 | flush_scheduled_work(); |
| @@ -785,10 +785,10 @@ static void __init do_basic_setup(void) | |||
| 785 | 785 | ||
| 786 | static void __init do_pre_smp_initcalls(void) | 786 | static void __init do_pre_smp_initcalls(void) |
| 787 | { | 787 | { |
| 788 | initcall_t *call; | 788 | initcall_t *fn; |
| 789 | 789 | ||
| 790 | for (call = __initcall_start; call < __early_initcall_end; call++) | 790 | for (fn = __initcall_start; fn < __early_initcall_end; fn++) |
| 791 | do_one_initcall(*call); | 791 | do_one_initcall(*fn); |
| 792 | } | 792 | } |
| 793 | 793 | ||
| 794 | static void run_init_process(char *init_filename) | 794 | static void run_init_process(char *init_filename) |
