Please pull git390 'for-linus' branch
Subsystems (2)
Please pull from 'for-linus' branch of
git://git390.osdl.marist.edu/pub/scm/linux-2.6.git for-linus
to receive the following updates:
drivers/s390/char/monwriter.c | 2 +- drivers/s390/cio/cio.c | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-)
Melissa Howland (1):
[S390] Change max. buffer size for monwriter device.
Michael Holzheu (1):
[S390] cio: fix stsch_reset.
drivers/s390/char/monwriter.c +1 -1
@@ -23,7 +23,7 @@#include <asm/appldata.h> #include <asm/monwriter.h> -#define MONWRITE_MAX_DATALEN 4024 +#define MONWRITE_MAX_DATALEN 4010static int mon_max_bufs =255 ;static int mon_buf_count;
drivers/s390/cio/cio.c +10 -3
@@ -2,8 +2,7 @@* drivers/s390/cio/cio.c * S/390 common I/O routines -- low level i/o calls * -* Copyright (C) 1999-2002 IBM Deutschland Entwicklung GmbH, -* IBM Corporation +* Copyright (C) IBM Corp. 1999,2006 * Author(s): Ingo Adlung ([email protected]) * Cornelia Huck ([email protected]) * Arnd Bergmann ([email protected])
@@ -881,10 +880,18 @@ static void cio_reset_pgm_check_handler(void)static int stsch_reset (struct subchannel_id schid,volatile struct schib *addr) {int rc; + register struct subchannel_id reg1 asm ("1") = schid; pgm_check_occured =0 ; s390_reset_pgm_handler = cio_reset_pgm_check_handler; - rc =stsch (schid, addr); + + asmvolatile ( +" stsch 0(%2)\n" +" ipm %0\n" +" srl %0,28" + :"=d" (rc) + :"d" (reg1),"a" (addr),"m" (*addr) :"memory" ,"cc" ); + s390_reset_pgm_handler =NULL ;if (pgm_check_occured)return -EIO ;