[Patch] kernel/module.c: fix an unused goto label

[Patch] kernel/module.c: fix an unused goto label

[Américo Wang]

Label 'free_init' is only used when defined(CONFIG_MODULE_UNLOAD) &&
defined(CONFIG_SMP), so move it inside to shut up gcc.

Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>

---
diff --git a/kernel/module.c b/kernel/module.c
index 1196f5d..df00a1b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2288,8 +2288,8 @@ static noinline struct module *load_module(void __user *umod,
 	ftrace_release(mod->module_core, mod->core_size);
  free_unload:
 	module_unload_free(mod);
- free_init:
 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
+ free_init:
 	percpu_modfree(mod->refptr);
 #endif
 	module_free(mod, mod->module_init);

 

Re: [Patch] kernel/module.c: fix an unused goto label

[Ingo Molnar]

* Américo Wang <xiyou.wangcong@gmail.com> wrote:

> Label 'free_init' is only used when defined(CONFIG_MODULE_UNLOAD) &&
> defined(CONFIG_SMP), so move it inside to shut up gcc.
> 
> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
> Cc: Rusty Russell <rusty@rustcorp.com.au>

was already sent a week ago - see below.

	Ingo

------------->
>From 67f5ca081c6ace125e8ccc76b8a7d99b091abaa7 Mon Sep 17 00:00:00 2001
From: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Date: Wed, 18 Mar 2009 23:49:26 +0200
Subject: [PATCH] modules: Restrict definition of a label in kernel/module.c

Impact: cleanup

In function 'load_module' in kernel/module.c, the label 'free_init'
is used if and only if both CONFIG_MODULE_UNLOAD and CONFIG_SMP are
defined. However, the label itself is defined unconditionally,
which may produce the following warning:

kernel/module.c:2291: warning: label 'free_init' defined but not used

This patch fixes the warning by moving the label definition under an
appropriate preprocessor construct.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
Cc: akpm@linux-foundation.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
 kernel/module.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/module.c b/kernel/module.c
index 1196f5d..df00a1b 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2288,8 +2288,8 @@ static noinline struct module *load_module(void __user *umod,
 	ftrace_release(mod->module_core, mod->core_size);
  free_unload:
 	module_unload_free(mod);
- free_init:
 #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP)
+ free_init:
 	percpu_modfree(mod->refptr);
 #endif
 	module_free(mod, mod->module_init);

Re: [Patch] kernel/module.c: fix an unused goto label

[Américo Wang]

On Tue, Mar 24, 2009 at 08:26:47PM +0100, Ingo Molnar wrote:
>
>* Américo Wang <xiyou.wangcong@gmail.com> wrote:
>
>> Label 'free_init' is only used when defined(CONFIG_MODULE_UNLOAD) &&
>> defined(CONFIG_SMP), so move it inside to shut up gcc.
>> 
>> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
>> Cc: Rusty Russell <rusty@rustcorp.com.au>
>
>was already sent a week ago - see below.
>

Oh, OK then! Thanks for your point! Please ignore my patch. :)


-- 
Do what you love, f**k the rest! F**k the regulations!
 

Re: [Patch] kernel/module.c: fix an unused goto label

[Rusty Russell]

On Wednesday 25 March 2009 02:37:19 Américo Wang wrote:
> 
> Label 'free_init' is only used when defined(CONFIG_MODULE_UNLOAD) &&
> defined(CONFIG_SMP), so move it inside to shut up gcc.

Thanks, applied!
Rusty.