diff options
author | Cong Wang <xiyou.wangcong@gmail.com> | 2012-04-03 02:13:36 -0400 |
---|---|---|
committer | Philipp Reisner <philipp.reisner@linbit.com> | 2012-05-10 06:00:54 -0400 |
commit | bc4854bc91c9a7f117437215cd8b16a0a5671d93 (patch) | |
tree | 569927c0035f099665a4e76412cc090d96ba157b /drivers/block | |
parent | f6d0a8dbfdce4b4f28fcb0f689c373874646f87c (diff) |
drbd: check MODULE for THIS_MODULE
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]
Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Philipp Reisner <philipp.reisner@linbit.com>
Signed-off-by: Lars Ellenberg <lars.ellenberg@linbit.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/drbd/drbd_main.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index bd380b94fd08..920ede2829d6 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c | |||
@@ -4365,12 +4365,11 @@ const char *drbd_buildtag(void) | |||
4365 | static char buildtag[38] = "\0uilt-in"; | 4365 | static char buildtag[38] = "\0uilt-in"; |
4366 | 4366 | ||
4367 | if (buildtag[0] == 0) { | 4367 | if (buildtag[0] == 0) { |
4368 | #ifdef CONFIG_MODULES | 4368 | #ifdef MODULE |
4369 | if (THIS_MODULE != NULL) | 4369 | sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); |
4370 | sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion); | 4370 | #else |
4371 | else | 4371 | buildtag[0] = 'b'; |
4372 | #endif | 4372 | #endif |
4373 | buildtag[0] = 'b'; | ||
4374 | } | 4373 | } |
4375 | 4374 | ||
4376 | return buildtag; | 4375 | return buildtag; |