[PATCH] kprobes: remove redundant config check

[PATCH] kprobes: remove redundant config check

[Abhishek Sagar]

Hi,

I noticed that there's a CONFIG_KPROBES check inside kernel/kprobes.c,
which seems redundant. Can be removed?

Diff'd against v2.6.26-rc5.


Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
---
remove redundant CONFIG_KPROBES check.

diff --git a/kernel/kprobes.c b/kernel/kprobes.c
index 1e0250c..2b2cae2 100644
--- a/kernel/kprobes.c
+++ b/kernel/kprobes.c
@@ -1283,13 +1283,8 @@ EXPORT_SYMBOL_GPL(register_jprobe);
 EXPORT_SYMBOL_GPL(unregister_jprobe);
 EXPORT_SYMBOL_GPL(register_jprobes);
 EXPORT_SYMBOL_GPL(unregister_jprobes);
-#ifdef CONFIG_KPROBES
 EXPORT_SYMBOL_GPL(jprobe_return);
-#endif
-
-#ifdef CONFIG_KPROBES
 EXPORT_SYMBOL_GPL(register_kretprobe);
 EXPORT_SYMBOL_GPL(unregister_kretprobe);
 EXPORT_SYMBOL_GPL(register_kretprobes);
 EXPORT_SYMBOL_GPL(unregister_kretprobes);
-#endif

Re: [PATCH] kprobes: remove redundant config check

[Masami Hiramatsu]

Abhishek Sagar wrote:
> Hi,
> 
> I noticed that there's a CONFIG_KPROBES check inside kernel/kprobes.c,
> which seems redundant. Can be removed?

Yes, it can be removed, because kernel/kprobes.c is not complied when
CONFIG_KPROBES=n.

Thank you,

> 
> Diff'd against v2.6.26-rc5.
> 
> 
> Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
Acked-by: Masami Hiramatsu <mhiramat@redhat.com>

-- 
Masami Hiramatsu

Software Engineer
Hitachi Computer Products (America) Inc.
Software Solutions Division

e-mail: mhiramat@redhat.com

Re: [PATCH] kprobes: remove redundant config check

[Ananth N Mavinakayanahalli]

On Tue, Jun 10, 2008 at 10:43:02PM +0530, Abhishek Sagar wrote:
> Hi,
> 
> I noticed that there's a CONFIG_KPROBES check inside kernel/kprobes.c,
> which seems redundant. Can be removed?
> 
> Diff'd against v2.6.26-rc5.
> 
> 
> Signed-off-by: Abhishek Sagar <sagar.abhishek@gmail.com>
> ---
> remove redundant CONFIG_KPROBES check.
> 
> diff --git a/kernel/kprobes.c b/kernel/kprobes.c
> index 1e0250c..2b2cae2 100644
> --- a/kernel/kprobes.c
> +++ b/kernel/kprobes.c
> @@ -1283,13 +1283,8 @@ EXPORT_SYMBOL_GPL(register_jprobe);
>  EXPORT_SYMBOL_GPL(unregister_jprobe);
>  EXPORT_SYMBOL_GPL(register_jprobes);
>  EXPORT_SYMBOL_GPL(unregister_jprobes);
> -#ifdef CONFIG_KPROBES
>  EXPORT_SYMBOL_GPL(jprobe_return);
> -#endif
> -
> -#ifdef CONFIG_KPROBES
>  EXPORT_SYMBOL_GPL(register_kretprobe);
>  EXPORT_SYMBOL_GPL(unregister_kretprobe);
>  EXPORT_SYMBOL_GPL(register_kretprobes);
>  EXPORT_SYMBOL_GPL(unregister_kretprobes);
> -#endif

Abhishek,

This was intentional (to take care of some gcc 4.2 issues). See commit
cd5bfea278987ebfe60f3ff92a01696b17c4f978 (fix compilation with gcc 4.2)
from Peter Chubb for details.

Ananth

Re: [PATCH] kprobes: remove redundant config check

[Abhishek Sagar]

On 6/11/08, Ananth N Mavinakayanahalli <ananth@in.ibm.com> wrote:
> Abhishek,
>
>  This was intentional (to take care of some gcc 4.2 issues). See commit
>  cd5bfea278987ebfe60f3ff92a01696b17c4f978 (fix compilation with gcc 4.2)
>  from Peter Chubb for details.

Yea, I checked it out and the problem the commit seems to be fixing is that
EXPORT_SYMBOL  complains for static symbols with gcc-4.2. Can't see why
there was a need to cram CONFIG_KPROBES inside kprobes.c. This
check was sneaked in defensively it seems, and is unnecessary.

--
Regards,
Abhishek Sagar