| 1 |
Author: mpagano |
| 2 |
Date: 2009-01-12 20:14:08 +0000 (Mon, 12 Jan 2009) |
| 3 |
New Revision: 1461 |
| 4 |
|
| 5 |
Added: |
| 6 |
genpatches-2.6/trunk/2.6.27/1715_s390-02.patch |
| 7 |
genpatches-2.6/trunk/2.6.27/1720_s390-03.patch |
| 8 |
Modified: |
| 9 |
genpatches-2.6/trunk/2.6.27/0000_README |
| 10 |
Log: |
| 11 |
Additional s390 patches as per bug #252421 |
| 12 |
|
| 13 |
Modified: genpatches-2.6/trunk/2.6.27/0000_README |
| 14 |
=================================================================== |
| 15 |
--- genpatches-2.6/trunk/2.6.27/0000_README 2009-01-11 21:14:30 UTC (rev 1460) |
| 16 |
+++ genpatches-2.6/trunk/2.6.27/0000_README 2009-01-12 20:14:08 UTC (rev 1461) |
| 17 |
@@ -91,6 +91,14 @@ |
| 18 |
From: http://bugs.gentoo.org/252421 |
| 19 |
Desc: IBM's s390-01 fixes for s390 architecture |
| 20 |
|
| 21 |
+Patch: 1715_s390-02.patch |
| 22 |
+From: http://bugs.gentoo.org/252421 |
| 23 |
+Desc: IBM's s390-02 fixes for s390 architecture |
| 24 |
+ |
| 25 |
+Patch: 1720_s390-03.patch |
| 26 |
+From: http://bugs.gentoo.org/252421 |
| 27 |
+Desc: IBM's s390-03 fixes for s390 architecture |
| 28 |
+ |
| 29 |
Patch: 2300_irda-transfer-breakage.patch |
| 30 |
From: http://bugs.gentoo.org/254046 |
| 31 |
Desc: Fix data transfer over IrDA |
| 32 |
|
| 33 |
Added: genpatches-2.6/trunk/2.6.27/1715_s390-02.patch |
| 34 |
=================================================================== |
| 35 |
--- genpatches-2.6/trunk/2.6.27/1715_s390-02.patch (rev 0) |
| 36 |
+++ genpatches-2.6/trunk/2.6.27/1715_s390-02.patch 2009-01-12 20:14:08 UTC (rev 1461) |
| 37 |
@@ -0,0 +1,33 @@ |
| 38 |
+From: Jan Glauber <jang@××××××××××××××.com> |
| 39 |
+Date: Fri, 9 Jan 2009 11:14:55 +0000 (+0100) |
| 40 |
+Subject: [S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled |
| 41 |
+X-Git-Tag: v2.6.29-rc1~24^2~7 |
| 42 |
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=19cdd08ba155dd87ebb87bb39ed097dbee671e0e |
| 43 |
+ |
| 44 |
+[S390] qdio: fix broken pointer in case of CONFIG_DEBUG_FS is disabled |
| 45 |
+ |
| 46 |
+If CONFIG_DEBUG_FS is disabled debugfs_create_file returns -ENODEV instead |
| 47 |
+of zero. Since the return value is stored and used at shutdown to remove |
| 48 |
+existing entries an OOPS may be triggered. |
| 49 |
+ |
| 50 |
+Add a check of the debugfs_create_file return value and in case of an error |
| 51 |
+set the entry to NULL so it will be ignored at shutdown. |
| 52 |
+ |
| 53 |
+Signed-off-by: Jan Glauber <jang@××××××××××××××.com> |
| 54 |
+Signed-off-by: Martin Schwidefsky <schwidefsky@××××××.com> |
| 55 |
+--- |
| 56 |
+ |
| 57 |
+diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c |
| 58 |
+index f8a3b69..da7afb0 100644 |
| 59 |
+--- a/drivers/s390/cio/qdio_debug.c |
| 60 |
++++ b/drivers/s390/cio/qdio_debug.c |
| 61 |
+@@ -169,6 +169,8 @@ static void setup_debugfs_entry(struct qdio_q *q, struct ccw_device *cdev) |
| 62 |
+ q->nr); |
| 63 |
+ debugfs_queues[i] = debugfs_create_file(name, S_IFREG | S_IRUGO | S_IWUSR, |
| 64 |
+ debugfs_root, q, &debugfs_fops); |
| 65 |
++ if (IS_ERR(debugfs_queues[i])) |
| 66 |
++ debugfs_queues[i] = NULL; |
| 67 |
+ } |
| 68 |
+ |
| 69 |
+ void qdio_setup_debug_entries(struct qdio_irq *irq_ptr, struct ccw_device *cdev) |
| 70 |
+ |
| 71 |
|
| 72 |
Added: genpatches-2.6/trunk/2.6.27/1720_s390-03.patch |
| 73 |
=================================================================== |
| 74 |
--- genpatches-2.6/trunk/2.6.27/1720_s390-03.patch (rev 0) |
| 75 |
+++ genpatches-2.6/trunk/2.6.27/1720_s390-03.patch 2009-01-12 20:14:08 UTC (rev 1461) |
| 76 |
@@ -0,0 +1,13 @@ |
| 77 |
+partial fixup of linux-2.6.27-s390-01-007-zfcp-perf-data.diff |
| 78 |
+ |
| 79 |
+--- linux-2.6.27/drivers/s390/scsi/zfcp_fsf.c |
| 80 |
++++ linux-2.6.27/drivers/s390/scsi/zfcp_fsf.c |
| 81 |
+@@ -782,7 +782,7 @@ |
| 82 |
+ list_add_tail(&req->list, &adapter->req_list[idx]); |
| 83 |
+ spin_unlock_irqrestore(&adapter->req_list_lock, flags); |
| 84 |
+ |
| 85 |
+- req->qdio_outb_usage = atomic_read(&req_q->count); |
| 86 |
++ req->qdio_outb_usage = atomic_read(&adapter->req_q.count); |
| 87 |
+ req->issued = get_clock(); |
| 88 |
+ if (zfcp_qdio_send(req)) { |
| 89 |
+ del_timer(&req->timer); |
Archives