[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20120409161427.1decc2c1.akpm@linux-foundation.org>
Date: Mon, 9 Apr 2012 16:14:27 -0700
From: Andrew Morton <akpm@...ux-foundation.org>
To: Cong Wang <xiyou.wangcong@...il.com>
Cc: linux-kernel@...r.kernel.org,
Lars Ellenberg <drbd-dev@...ts.linbit.com>,
drbd-user@...ts.linbit.com
Subject: Re: [Patch] drbd: check MODULE for THIS_MODULE
On Tue, 3 Apr 2012 14:13:36 +0800
Cong Wang <xiyou.wangcong@...il.com> wrote:
> THIS_MODULE is NULL only when drbd is compiled as built-in,
> so the #ifdef CONFIG_MODULES should be #ifdef MODULE instead.
>
> This fixes the warning:
>
> drivers/block/drbd/drbd_main.c: In function ___drbd_buildtag___:
> drivers/block/drbd/drbd_main.c:4187:24: warning: the comparison will always evaluate as ___true___ for the address of _____this_module___ will never be NULL [-Waddress]
>
> Cc: Lars Ellenberg <drbd-dev@...ts.linbit.com>
> Signed-off-by: WANG Cong <xiyou.wangcong@...il.com>
>
> ---
> diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c
> index 211fc44..96c432f 100644
> --- a/drivers/block/drbd/drbd_main.c
> +++ b/drivers/block/drbd/drbd_main.c
> @@ -4183,12 +4183,11 @@ const char *drbd_buildtag(void)
> static char buildtag[38] = "\0uilt-in";
>
> if (buildtag[0] == 0) {
> -#ifdef CONFIG_MODULES
> - if (THIS_MODULE != NULL)
> - sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
> - else
> +#ifdef MODULE
> + sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
> +#else
> + buildtag[0] = 'b';
> #endif
> - buildtag[0] = 'b';
> }
>
> return buildtag;
If the MODULE_SRCVERSION_ALL help in init/Kconfig is to be believed,
this should depend on CONFIG_MODULE_SRCVERSION_ALL?
But drbd is the only driver in all of Linux which plays with
srcversion. Can we just delete this code?
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists