[gentoo-commits] linux-patches r1461 - genpatches-2.6/trunk/2.6.27

[gentoo-commits] linux-patches r1461 - genpatches-2.6/trunk/2.6.27

[Mike Pagano (mpagano)]

Author: mpagano
Date: 2009-01-12 20:14:08 +0000 (Mon, 12 Jan 2009)
New Revision: 1461

Added:
   genpatches-2.6/trunk/2.6.27/1715_s390-02.patch
   genpatches-2.6/trunk/2.6.27/1720_s390-03.patch
Modified:
   genpatches-2.6/trunk/2.6.27/0000_README
Log:
Additional s390 patches as per bug #252421

Modified: genpatches-2.6/trunk/2.6.27/0000_README
===================================================================
--- genpatches-2.6/trunk/2.6.27/0000_README	2009-01-11 21:14:30 UTC (rev 1460)
+++ genpatches-2.6/trunk/2.6.27/0000_README	2009-01-12 20:14:08 UTC (rev 1461)
@@ -91,6 +91,14 @@
 From:	http://bugs.gentoo.org/252421
 Desc:	IBM's s390-01 fixes for s390 architecture
 
+Patch:	1715_s390-02.patch
+From:	http://bugs.gentoo.org/252421
+Desc:	IBM's s390-02 fixes for s390 architecture
+
+Patch:	1720_s390-03.patch
+From:	http://bugs.gentoo.org/252421
+Desc:	IBM's s390-03 fixes for s390 architecture
+
 Patch:	2300_irda-transfer-breakage.patch
 From:	http://bugs.gentoo.org/254046
 Desc:	Fix data transfer over IrDA

Added: genpatches-2.6/trunk/2.6.27/1715_s390-02.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/1715_s390-02.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.27/1715_s390-02.patch	2009-01-12 20:14:08 UTC (rev 1461)
@@ -0,0 +1,33 @@
+From: Jan Glauber <jang@linux.vnet.ibm.com>
+Date: Fri, 9 Jan 2009 11:14:55 +0000 (+0100)
+Subject: [S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled
+X-Git-Tag: v2.6.29-rc1~24^2~7
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=19cdd08ba155dd87ebb87bb39ed097dbee671e0e
+
+[S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled
+
+If CONFIG_DEBUG_FS is disabled debugfs_create_file returns -ENODEV instead
+of zero. Since the return value is stored and used at shutdown to remove
+existing entries an OOPS may be triggered.
+
+Add a check of the debugfs_create_file return value and in case of an error
+set the entry to NULL so it will be ignored at shutdown.
+
+Signed-off-by: Jan Glauber <jang@linux.vnet.ibm.com>
+Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
+---
+
+diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
+index f8a3b69..da7afb0 100644
+--- a/drivers/s390/cio/qdio_debug.c
++++ b/drivers/s390/cio/qdio_debug.c
+@@ -169,6 +169,8 @@ static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev)
+ 		 q->nr);
+ 	debugfs_queues[i] = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR,
+ 						debugfs_root, q, &debugfs_fops);
++	if (IS_ERR(debugfs_queues[i]))
++		debugfs_queues[i] = NULL;
+ }
+ 
+ void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev)
+

Added: genpatches-2.6/trunk/2.6.27/1720_s390-03.patch
===================================================================
--- genpatches-2.6/trunk/2.6.27/1720_s390-03.patch	                        (rev 0)
+++ genpatches-2.6/trunk/2.6.27/1720_s390-03.patch	2009-01-12 20:14:08 UTC (rev 1461)
@@ -0,0 +1,13 @@
+partial fixup of linux-2.6.27-s390-01-007-zfcp-perf-data.diff
+
+--- linux-2.6.27/drivers/s390/scsi/zfcp_fsf.c
++++ linux-2.6.27/drivers/s390/scsi/zfcp_fsf.c
+@@ -782,7 +782,7 @@
+ 	list_add_tail(&req->list, &adapter->req_list[idx]);
+ 	spin_unlock_irqrestore(&adapter->req_list_lock, flags);
+ 
+-	req->qdio_outb_usage = atomic_read(&req_q->count);
++	req->qdio_outb_usage = atomic_read(&adapter->req_q.count);
+ 	req->issued = get_clock();
+ 	if (zfcp_qdio_send(req)) {
+ 		del_timer(&req->timer);