Please pull git390 'for-linus' branch
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:
arch/s390/kernel/kprobes.c | 2 +- drivers/s390/block/dasd_diag.c | 10 +++--- drivers/s390/cio/device_status.c | 6 +++- drivers/s390/crypto/ap_bus.c | 30 +++++++++++-------- include/asm-s390/checksum.h | 59 +++++++++---------------------------- 5 files changed, 43 insertions(+), 64 deletions(-)
Cornelia Huck (1):
[S390] cio: Device status validity.
David Wilder (1):
[S390] kprobes: Align probe address.
Heiko Carstens (1):
[S390] Fix TCP/UDP pseudo header checksum computation.
Peter Oberparleiter (1):
[S390] dasd: Work around gcc bug.
Ralph Wuerthner (2):
[S390] zcrypt: Fix possible dead lock in AP bus module. [S390] zcrypt: Fix ap_poll_requests counter in lost requests error path.
arch/s390/kernel/kprobes.c +1 -1
@@ -167,7 +167,7 @@ static int __kprobes swap_instruction(void *aref)* shall not cross any page boundaries (vmalloc area!) when writing * the new instruction. */ - addr = (u32 *)ALIGN ((unsigned long )args->ptr,4 ); + addr = (u32 *)((unsigned long )args->ptr &-4UL );if ((unsigned long )args->ptr &2 ) instr = ((*addr) &0xffff0000 ) | args->new;else
drivers/s390/block/dasd_diag.c +5 -5
@@ -65,7 +65,7 @@ static const u8 DASD_DIAG_CMS1[] = { 0xc3, 0xd4, 0xe2, 0xf1 };/* EBCDIC CMS1 */* resulting condition code and DIAG return code. */ static inline int dia250 (void *iob,int cmd) { - register unsigned long reg0 asm ("0") = (unsigned long) iob; + register unsigned long reg2 asm ("2") = (unsigned long) iob; typedef union { struct dasd_diag_init_io init_io; struct dasd_diag_rw_io rw_io;
@@ -74,15 +74,15 @@ static inline int dia250(void *iob, int cmd) rc =3 ; asmvolatile ( -" diag 0,%2,0x250\n" +" diag 2,%2,0x250\n" "0: ipm %0\n" " srl %0,28\n" -" or %0,1\n" +" or %0,3\n" "1:\n" EX_TABLE(0b,1b) : "+d" (rc), "=m" (*(addr_type *) iob) - : "d" (cmd), "d" (reg0), "m" (*(addr_type *) iob) - : "1", "cc"); + : "d" (cmd), "d" (reg2), "m" (*(addr_type *) iob) + : "3", "cc"); return rc; }
drivers/s390/cio/device_status.c +5 -1
@@ -263,7 +263,11 @@ ccw_device_accumulate_irb(struct ccw_device *cdev, struct irb *irb) cdev_irb->scsw.cpa = irb->scsw.cpa;/* Accumulate device status, but not the device busy flag. */ cdev_irb->scsw.dstat &= ~DEV_STAT_BUSY ; - cdev_irb->scsw.dstat |= irb->scsw.dstat; +/* dstat is not always valid. */ +if (irb->scsw.stctl & + (SCSW_STCTL_PRIM_STATUS |SCSW_STCTL_SEC_STATUS + |SCSW_STCTL_INTER_STATUS |SCSW_STCTL_ALERT_STATUS )) + cdev_irb->scsw.dstat |= irb->scsw.dstat;/* Accumulate subchannel status. */ cdev_irb->scsw.cstat |= irb->scsw.cstat;/* Copy residual count if it is valid. */
drivers/s390/crypto/ap_bus.c +17 -13
@@ -505,6 +505,9 @@ static int ap_device_remove(struct device *dev)spin_lock_bh (&ap_device_lock);list_del_init (&ap_dev->list);spin_unlock_bh (&ap_device_lock); +spin_lock_bh (&ap_dev->lock); +atomic_sub (ap_dev->queue_count, &ap_poll_requests); +spin_unlock_bh (&ap_dev->lock);return 0 ; }
@@ -757,10 +760,16 @@ static void ap_scan_bus(struct work_struct *unused) (void *)(unsigned long )qid, __ap_scan_bus); rc =ap_query_queue (qid, &queue_depth, &device_type); -if (dev && rc) { -put_device (dev); -device_unregister (dev); -continue ; +if (dev) { + ap_dev =to_ap_dev (dev); +spin_lock_bh (&ap_dev->lock); +if (rc || ap_dev->unregistered) { +spin_unlock_bh (&ap_dev->lock); +put_device (dev); +device_unregister (dev); +continue ; + }else +spin_unlock_bh (&ap_dev->lock); }if (dev) {put_device (dev);
@@ -861,6 +870,7 @@ static int ap_poll_read(struct ap_device *ap_dev, unsigned long *flags)case AP_RESPONSE_NO_PENDING_REPLY :if (status.queue_empty) {/* The card shouldn't forget requests but who knows. */ +atomic_sub (ap_dev->queue_count, &ap_poll_requests); ap_dev->queue_count =0 ;list_splice_init (&ap_dev->pendingq, &ap_dev->requestq); ap_dev->requestq_count += ap_dev->pendingq_count;
@@ -994,7 +1004,7 @@ void ap_queue_message(struct ap_device *ap_dev, struct ap_message *ap_msg) ap_dev->unregistered =1 ; }else { ap_dev->drv->receive (ap_dev, ap_msg,ERR_PTR (-ENODEV )); - rc =0 ; + rc = -ENODEV ; }spin_unlock_bh (&ap_dev->lock);if (rc == -ENODEV )
@@ -1044,18 +1054,12 @@ static void ap_poll_timeout(unsigned long unused)*/ static int __ap_poll_all (struct ap_device *ap_dev,unsigned long *flags) { -int rc; -spin_lock (&ap_dev->lock);if (!ap_dev->unregistered) { - rc =ap_poll_queue (ap_dev, flags); -if (rc) +if (ap_poll_queue (ap_dev, flags)) ap_dev->unregistered =1 ; - }else - rc =0 ; + }spin_unlock (&ap_dev->lock); -if (rc) -device_unregister (&ap_dev->device);return 0 ; }
include/asm-s390/checksum.h +15 -44
65 lines not on this page · raw message