Messages in this thread | | | Date | Tue, 21 Oct 2008 11:17:37 +0200 | From | Alejandro Riveira Fernández <> | Subject | Re: [net/9p/9pnet.c] Compile error |
| |
El Mon, 20 Oct 2008 16:04:43 -0500 "Eric Van Hensbergen" <ericvh@gmail.com> escribió:
> On Mon, Oct 20, 2008 at 3:49 PM, Jason Baron <jbaron@redhat.com> wrote: > > On Mon, Oct 20, 2008 at 09:27:25PM +0200, Alejandro Riveira Fernández wrote: > >> Current Git > >> v2.6.27-6030-g6da0b38 > >> > >> I get a build error > >> > >> Kernel: arch/x86/boot/bzImage is ready (#17) > >> Building modules, stage 2. > >> MODPOST 571 modules > >> ERROR: "p9_debug_level" [net/9p/9pnet.ko] undefined! > >> make[3]: *** [__modpost] Error 1 > >> make[2]: *** [modules] Error 2 > >> make[1]: *** [sub-make] Error 2 > >> make: *** [all] Error 2 > >> > > Sorry for the mess. I'm pushing the following patch to my for-linus > tree which resolves the issue. > > -eric > > 9p: fix debug build error > > Fixes build problem with 9p when building with debug disabled. > Also contains some fixes for warnings which pop up when > CONFIG_NET_9P_DEBUG is disabled. > > Signed-off-by: Eric Van Hensbergen <ericvh@gmail.com>
Thanks for the quick response. _I tried to apply the patch but failed
$ git am ../9p.mbox Applying: Compile error fatal: corrupt patch at line 57 Patch failed at 0001. When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort".
Will wait until the fix hits mainline ;). Thanks again
> diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h > index d2c60c7..b77c147 100644 > --- a/include/net/9p/9p.h > +++ b/include/net/9p/9p.h > @@ -56,9 +56,9 @@ enum p9_debug_flags { > P9_DEBUG_PKT = (1<<10), > }; > > +#ifdef CONFIG_NET_9P_DEBUG > extern unsigned int p9_debug_level; > > -#ifdef CONFIG_NET_9P_DEBUG > #define P9_DPRINTK(level, format, arg...) \ > do { \ > if ((p9_debug_level & level) == level) {\ > diff --git a/net/9p/protocol.c b/net/9p/protocol.c > index 29be524..908e79f 100644 > --- a/net/9p/protocol.c > +++ b/net/9p/protocol.c > @@ -53,6 +53,7 @@ > static int > p9pdu_writef(struct p9_fcall *pdu, int optional, const char *fmt, ...); > > +#ifdef CONFIG_NET_9P_DEBUG > void > p9pdu_dump(int way, struct p9_fcall *pdu) > { > @@ -81,6 +82,12 @@ p9pdu_dump(int way, struct p9_fcall *pdu) > else > P9_DPRINTK(P9_DEBUG_PKT, "]]](%d) %s\n", datalen, buf); > } > +#else > +void > +p9pdu_dump(int way, struct p9_fcall *pdu) > +{ > +} > +#endif > EXPORT_SYMBOL(p9pdu_dump); > > void p9stat_free(struct p9_wstat *stbuf) > @@ -542,8 +549,10 @@ int p9pdu_finalize(struct p9_fcall *pdu) > err = p9pdu_writef(pdu, 0, "d", size); > pdu->size = size; > > +#ifdef CONFIG_NET_9P_DEBUG > if ((p9_debug_level & P9_DEBUG_PKT) == P9_DEBUG_PKT) > p9pdu_dump(0, pdu); > +#endif > > P9_DPRINTK(P9_DEBUG_9P, ">>> size=%d type: %d tag: %d\n", pdu->size, > pdu->id, pdu->tag); > diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c > index be65d82..1df0356 100644 > --- a/net/9p/trans_fd.c > +++ b/net/9p/trans_fd.c > @@ -678,11 +678,9 @@ static int p9_fd_request(struct p9_client > *client, struct p9_req_t *req) > > static int p9_fd_cancel(struct p9_client *client, struct p9_req_t *req) > { > - struct p9_trans_fd *ts = client->trans; > - struct p9_conn *m = ts->conn; > int ret = 1; > > - P9_DPRINTK(P9_DEBUG_TRANS, "mux %p req %p\n", m, req); > + P9_DPRINTK(P9_DEBUG_TRANS, "client %p req %p\n", client, req); > > spin_lock(&client->lock); > list_del(&req->req_list); > -- > To unsubscribe from this list: send the line "unsubscribe linux-kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/ -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |