rpms/kernel/devel linux-2.6-compile-fixes.patch,1.152,1.153

[Dave Jones (davej)]

Author: davej

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1685

Modified Files:
	linux-2.6-compile-fixes.patch 
Log Message:
better fix for v9fs

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -r1.152 -r1.153
--- linux-2.6-compile-fixes.patch	16 Jul 2007 15:05:00 -0000	1.152
+++ linux-2.6-compile-fixes.patch	16 Jul 2007 15:47:03 -0000	1.153
@@ -242,97 +242,22 @@
  out:
  	gss_put_ctx(ctx);
  	dprintk("RPC: %5u gss_unwrap_resp returning %d\n", task->tk_pid,
--- 
-1.5.3.rc0.63.gc956
 
-From davej  Mon Jul 16 07:46:53 2007
-Return-path: <linux-kernel-owner+davej=40kernelslacker.org-S1762197AbXGPLmB at vger.kernel.org>
-X-Spam-Checker-Version: SpamAssassin 3.2.1 (2007-05-02) on
-	gelk.kernelslacker.org
-X-Spam-Level: 
-X-Spam-Status: No, score=-2.4 required=5.0 tests=AWL,BAYES_00 autolearn=ham
-	version=3.2.1
-Envelope-to: davej at kernelslacker.org
-Delivery-date: Mon, 16 Jul 2007 12:42:10 +0100
-Received: from testure.choralone.org [194.9.77.134]
-	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.7)
-	for <davej at localhost> (single-drop); Mon, 16 Jul 2007 07:46:53 -0400 (EDT)
-Received: from vger.kernel.org ([209.132.176.167])
-	by testure.choralone.org with esmtp (Exim 4.67)
-	(envelope-from <linux-kernel-owner+davej=40kernelslacker.org-S1762197AbXGPLmB at vger.kernel.org>)
-	id 1IAOxt-0007vj-Vu
-	for davej at kernelslacker.org; Mon, 16 Jul 2007 12:42:10 +0100
-Received: (majordomo at vger.kernel.org) by vger.kernel.org via listexpand
-	id S1762197AbXGPLmB (ORCPT <rfc822;davej at kernelslacker.org>);
-	Mon, 16 Jul 2007 07:42:01 -0400
-Received: (majordomo at vger.kernel.org) by vger.kernel.org id S1755542AbXGPLlv
-	(ORCPT <rfc822;linux-kernel-outgoing>);
-	Mon, 16 Jul 2007 07:41:51 -0400
-Received: from smtp2.it.da.ut.ee ([193.40.5.67]:36493 "EHLO smtp2.it.da.ut.ee"
-	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
-	id S1753468AbXGPLlv (ORCPT <rfc822;linux-kernel at vger.kernel.org>);
-	Mon, 16 Jul 2007 07:41:51 -0400
-Received: from math.ut.ee (math.ut.ee [193.40.36.2])
-	by smtp2.it.da.ut.ee (Postfix) with ESMTP id DF8324C039CB;
-	Mon, 16 Jul 2007 14:41:48 +0300 (EEST)
-Received: by math.ut.ee (Postfix, from userid 1014)
-	id D6C986AF2D; Mon, 16 Jul 2007 14:41:48 +0300 (EEST)
-Received: from localhost (localhost [127.0.0.1])
-	by math.ut.ee (Postfix) with ESMTP id CE84A6ADEB;
-	Mon, 16 Jul 2007 14:41:48 +0300 (EEST)
-Date:	Mon, 16 Jul 2007 14:41:48 +0300 (EEST)
-From:	Meelis Roos <mroos at linux.ee>
-To:	Linux Kernel list <linux-kernel at vger.kernel.org>
-cc:	ericvh at gmail.com
-Subject: 9P compile fix
-Message-ID: <Pine.SOC.4.64.0707161432480.1471 at math.ut.ee>
-MIME-Version: 1.0
-Content-Type: TEXT/PLAIN; charset=US-ASCII
-Sender:	linux-kernel-owner at vger.kernel.org
-Precedence: bulk
-X-Mailing-List:	linux-kernel at vger.kernel.org
-Status: RO
-Content-Length: 1158
-Lines: 40
 
-With 9P but no 9P debug options, this error occurs:
-  CC [M]  fs/9p/v9fs.o
 fs/9p/v9fs.c: In function 'v9fs_parse_options':
 fs/9p/v9fs.c:134: error: 'p9_debug_level' undeclared (first use in this function)
 
-The following patch moves the definition of p9_debug_level out of #ifdef 
-and seems to fix the compilation.
-
-Signed-off-by: Meelis Roos <mroos at linux.ee>
-
-diff --git a/include/net/9p/9p.h b/include/net/9p/9p.h
-index 88884d3..8fc3796 100644
---- a/include/net/9p/9p.h
-+++ b/include/net/9p/9p.h
-@@ -27,6 +27,8 @@
- #ifndef NET_9P_H
- #define NET_9P_H
- 
-+extern unsigned int p9_debug_level;
-+
- #ifdef CONFIG_NET_9P_DEBUG
- 
- #define P9_DEBUG_ERROR		(1<<0)
-@@ -38,8 +40,6 @@
- #define P9_DEBUG_SLABS	      	(1<<7)
- #define P9_DEBUG_FCALL		(1<<8)
- 
--extern unsigned int p9_debug_level;
--
- #define P9_DPRINTK(level, format, arg...) \
- do {  \
- 	if ((p9_debug_level & level) == level) \
-
--- 
-Meelis Roos (mroos at linux.ee)
--
-To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
-the body of a message to majordomo at vger.kernel.org
-More majordomo info at  http://vger.kernel.org/majordomo-info.html
-Please read the FAQ at  http://www.tux.org/lkml/
+Signed-off-by: Dave Jones <davej at redhat.com>
 
+--- linux-2.6.22.noarch/fs/9p/v9fs.c~	2007-07-16 11:45:56.000000000 -0400
++++ linux-2.6.22.noarch/fs/9p/v9fs.c	2007-07-16 11:46:12.000000000 -0400
+@@ -131,7 +131,9 @@ static void v9fs_parse_options(char *opt
+ 		switch (token) {
+ 		case Opt_debug:
+ 			v9ses->debug = option;
++#ifdef CONFIG_NET_9P_DEBUG
+ 			p9_debug_level = option;
++#endif
+ 			break;
+ 		case Opt_port:
+ 			v9ses->port = option;