Re: linux-next: Tree for October 20

[Jason Baron <jbaron@redhat.com>]

On Mon, Oct 20, 2008 at 11:59:04PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's tree will not build for powerpc allyesconfig (libc aborts the
> link due to a free() problem), sparc(32) defconfig and probably some
> other configurations.
> 

hmmm...yeah, on x86_64 i've hit:

  CC [M]  net/9p/protocol.o
  LD [M]  net/9p/9pnet.o
  LD [M]  net/9p/9pnet_virtio.o
  Building modules, stage 2.
  MODPOST 1616 modules
ERROR: "p9_debug_level" [net/9p/9pnet.ko] undefined!


seems to be resolved by this simple patch:


Signed-off-by: Jason Baron <jbaron@redhat.com>


diff --git a/net/9p/protocol.c b/net/9p/protocol.c
index 29be524..ebf819e 100644
--- a/net/9p/protocol.c
+++ b/net/9p/protocol.c
@@ -542,8 +542,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);