From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, drbd-dev@lists.linbit.com
Cc: linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>,
akpm <akpm@linux-foundation.org>
Subject: [PATCH] drbd: fix build when CONFIG_MODULES=n
Date: Mon, 27 Jul 2009 07:55:36 -0700 [thread overview]
Message-ID: <20090727075536.533d1801.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20090727180552.eb32515b.sfr@canb.auug.org.au>
On Mon, 27 Jul 2009 18:05:52 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090724:
>
> New trees:
> drbd
>
> The drbd tree gained two build failures for which I reverted a commit from
> the rr tree and applied a patch.
> ----------------------------------------------------------------------------
(already fixed?)
---
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix drbd build when CONFIG_MODULES=n:
drivers/block/drbd/drbd_main.c:3738: error: dereferencing pointer to incomplete type
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: drbd-dev@lists.linbit.com
---
drivers/block/drbd/drbd_main.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20090727.orig/drivers/block/drbd/drbd_main.c
+++ linux-next-20090727/drivers/block/drbd/drbd_main.c
@@ -3733,12 +3733,16 @@ const char *drbd_buildtag(void)
static char buildtag[38] = "\0uilt-in";
+#ifdef CONFIG_MODULES
if (buildtag[0] == 0) {
if (THIS_MODULE != NULL)
sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
else
buildtag[0] = 'b';
}
+#else
+ buildtag[0] = 'b';
+#endif
return buildtag;
}
WARNING: multiple messages have this Message-ID (diff)
From: Randy Dunlap <randy.dunlap@oracle.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>, drbd-dev@lists.linbit.com
Cc: akpm <akpm@linux-foundation.org>,
linux-next@vger.kernel.org, LKML <linux-kernel@vger.kernel.org>
Subject: [Drbd-dev] [PATCH] drbd: fix build when CONFIG_MODULES=n
Date: Mon, 27 Jul 2009 07:55:36 -0700 [thread overview]
Message-ID: <20090727075536.533d1801.randy.dunlap@oracle.com> (raw)
In-Reply-To: <20090727180552.eb32515b.sfr@canb.auug.org.au>
On Mon, 27 Jul 2009 18:05:52 +1000 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090724:
>
> New trees:
> drbd
>
> The drbd tree gained two build failures for which I reverted a commit from
> the rr tree and applied a patch.
> ----------------------------------------------------------------------------
(already fixed?)
---
From: Randy Dunlap <randy.dunlap@oracle.com>
Fix drbd build when CONFIG_MODULES=n:
drivers/block/drbd/drbd_main.c:3738: error: dereferencing pointer to incomplete type
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: drbd-dev@lists.linbit.com
---
drivers/block/drbd/drbd_main.c | 4 ++++
1 file changed, 4 insertions(+)
--- linux-next-20090727.orig/drivers/block/drbd/drbd_main.c
+++ linux-next-20090727/drivers/block/drbd/drbd_main.c
@@ -3733,12 +3733,16 @@ const char *drbd_buildtag(void)
static char buildtag[38] = "\0uilt-in";
+#ifdef CONFIG_MODULES
if (buildtag[0] == 0) {
if (THIS_MODULE != NULL)
sprintf(buildtag, "srcversion: %-24s", THIS_MODULE->srcversion);
else
buildtag[0] = 'b';
}
+#else
+ buildtag[0] = 'b';
+#endif
return buildtag;
}
next prev parent reply other threads:[~2009-07-27 14:55 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-27 8:05 linux-next: Tree for July 27 Stephen Rothwell
2009-07-27 11:25 ` Next July 27: boot failure(hang) on x86_64 box Sachin Sant
2009-07-27 14:55 ` Randy Dunlap [this message]
2009-07-27 14:55 ` [Drbd-dev] [PATCH] drbd: fix build when CONFIG_MODULES=n Randy Dunlap
2009-07-27 20:35 ` linux-next: Tree for July 27 (tty locking) Bartlomiej Zolnierkiewicz
2009-07-27 21:34 ` Alan Cox
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090727075536.533d1801.randy.dunlap@oracle.com \
--to=randy.dunlap@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=drbd-dev@lists.linbit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.