[patch 1/11] s390: cio max channels checks.

[patch 1/11] s390: cio max channels checks.

[Martin Schwidefsky]

[patch 1/11] s390: cio max channels checks.

From: Cornelia Huck <cohuck@de.ibm.com>

Fix max channel check in cio_ignore display function.

Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diffstat:
 drivers/s390/cio/blacklist.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -urpN linux-2.6/drivers/s390/cio/blacklist.c linux-2.6-patched/drivers/s390/cio/blacklist.c
--- linux-2.6/drivers/s390/cio/blacklist.c	2005-03-02 08:37:53.000000000 +0100
+++ linux-2.6-patched/drivers/s390/cio/blacklist.c	2005-06-01 19:43:14.000000000 +0200
@@ -1,7 +1,7 @@
 /*
  *  drivers/s390/cio/blacklist.c
  *   S/390 common I/O routines -- blacklisting of specific devices
- *   $Revision: 1.33 $
+ *   $Revision: 1.34 $
  *
  *    Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH,
  *			      IBM Corporation
@@ -289,7 +289,7 @@ static int cio_ignore_read (char *page, 
 	len = 0;
 	for (devno = off; /* abuse the page variable
 			   * as counter, see fs/proc/generic.c */
-	     devno <= __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
+	     devno < __MAX_SUBCHANNELS && len + entry_size < count; devno++) {
 		if (!test_bit(devno, bl_dev))
 			continue;
 		len += sprintf(page + len, "0.0.%04lx", devno);
@@ -302,7 +302,7 @@ static int cio_ignore_read (char *page, 
 		len += sprintf(page + len, "\n");
 	}
 
-	if (devno <= __MAX_SUBCHANNELS)
+	if (devno < __MAX_SUBCHANNELS)
 		*eof = 1;
 	*start = (char *) (devno - off); /* number of checked entries */
 	return len;

Re: [patch 1/11] s390: cio max channels checks.

[Andrew Morton]

Martin Schwidefsky <schwidefsky@de.ibm.com> wrote:
>
> [patch 1/11] s390: cio max channels checks.

Which of these patches are considered to be 2.6.12 material?

Re: [patch 1/11] s390: cio max channels checks.

[Martin Schwidefsky]

> > [patch 1/11] s390: cio max channels checks.
>
> Which of these patches are considered to be 2.6.12 material?

All the patches are pretty short but if I had to choose I'd say
at least the following 4 patches should go into 2.6.12:

[patch 3/11] s390: ptrace peek and poke.
[patch 4/11] s390: uml ptrace fixes.
[patch 6/11] s390: in_interrupt vs. in_atomic.
[patch 9/11] s390: deadlock in appldata.

blue skies,
   Martin

Martin Schwidefsky
Linux for zSeries Development & Services
IBM Deutschland Entwicklung GmbH