Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (21 commits)
  [S390] dasd: fix race condition in resume code
  [S390] Add EX_TABLE for addressing exception in usercopy functions.
  [S390] 64-bit register support for 31-bit processes
  [S390] hibernate: Use correct place for CPU address in lowcore
  [S390] pm: ignore time spend in suspended state
  [S390] zcrypt: Improve some comments
  [S390] zcrypt: Fix sparse warning.
  [S390] perf_counter: fix vdso detection
  [S390] ftrace: drop nmi protection
  [S390] compat: fix truncate system call wrapper
  [S390] Provide arch specific mdelay implementation.
  [S390] Fix enabled udelay for short delays.
  [S390] cio: allow setting boxed devices offline
  [S390] cio: make not operational handling consistent
  [S390] cio: make disconnected handling consistent
  [S390] Fix memory leak in /proc/cio_ignore
  [S390] cio: channel path memory leak
  [S390] module: fix memory leak in s390 module loader
  [S390] Enable kmemleak on s390.
  [S390] 3270 console build fix
  ...

9 files changed, 56 insertions, 28 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index dad0449475b6..53b8c255360a 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -2508,8 +2508,6 @@ int dasd_generic_restore_device(struct ccw_device *cdev)
         device->stopped &= ~DASD_UNRESUMED_PM;
 
         dasd_schedule_device_bh(device);
-        if (device->block)
-                dasd_schedule_block_bh(device->block);
 
         if (device->discipline->restore)
                 rc = device->discipline->restore(device);
@@ -2520,6 +2518,9 @@ int dasd_generic_restore_device(struct ccw_device *cdev)
                  */
                 device->stopped |= DASD_UNRESUMED_PM;
 
+        if (device->block)
+                dasd_schedule_block_bh(device->block);
+
         dasd_put_device(device);
         return 0;
 }
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index ab3521755588..0be7c15f45c5 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -2338,6 +2338,8 @@ static struct dasd_ccw_req *dasd_eckd_build_cp(struct dasd_device *startdev,
         /* Calculate number of blocks/records per track. */
         blksize = block->bp_block;
         blk_per_trk = recs_per_track(&private->rdc_data, 0, blksize);
+        if (blk_per_trk == 0)
+                return ERR_PTR(-EINVAL);
         /* Calculate record id of first and last block. */
         first_rec = first_trk = blk_rq_pos(req) >> block->s2b_shift;
         first_offs = sector_div(first_trk, blk_per_trk);
@@ -3211,6 +3213,7 @@ int dasd_eckd_pm_freeze(struct dasd_device *device)
 int dasd_eckd_restore_device(struct dasd_device *device)
 {
         struct dasd_eckd_private *private;
+        struct dasd_eckd_characteristics temp_rdc_data;
         int is_known, rc;
         struct dasd_uid temp_uid;
 
@@ -3245,15 +3248,17 @@ int dasd_eckd_restore_device(struct dasd_device *device)
         dasd_eckd_read_features(device);
 
         /* Read Device Characteristics */
-        memset(&private->rdc_data, 0, sizeof(private->rdc_data));
         rc = dasd_generic_read_dev_chars(device, DASD_ECKD_MAGIC,
-                                         &private->rdc_data, 64);
+                                         &temp_rdc_data, 64);
         if (rc) {
                 DBF_EVENT(DBF_WARNING,
                           "Read device characteristics failed, rc=%d for "
                           "device: %s", rc, dev_name(&device->cdev->dev));
                 goto out_err;
         }
+        spin_lock(get_ccwdev_lock(device->cdev));
+        memcpy(&private->rdc_data, &temp_rdc_data, sizeof(temp_rdc_data));
+        spin_unlock(get_ccwdev_lock(device->cdev));
 
         /* add device to alias management */
         dasd_alias_add_device(device);
diff --git a/drivers/s390/char/raw3270.c b/drivers/s390/char/raw3270.c
index d6a022f55e92..62ddf5202b79 100644
--- a/drivers/s390/char/raw3270.c
+++ b/drivers/s390/char/raw3270.c
@@ -1361,11 +1361,13 @@ static int raw3270_pm_start(struct ccw_device *cdev)
 
 void raw3270_pm_unfreeze(struct raw3270_view *view)
 {
+#ifdef CONFIG_TN3270_CONSOLE
         struct raw3270 *rp;
 
         rp = view->dev;
         if (rp && test_bit(RAW3270_FLAGS_FROZEN, &rp->flags))
                 ccw_device_force_console();
+#endif
 }
 
 static struct ccw_device_id raw3270_id[] = {
diff --git a/drivers/s390/cio/blacklist.c b/drivers/s390/cio/blacklist.c
index 6565f027791e..7eab9ab9f406 100644
--- a/drivers/s390/cio/blacklist.c
+++ b/drivers/s390/cio/blacklist.c
@@ -265,13 +265,11 @@ struct ccwdev_iter {
 static void *
 cio_ignore_proc_seq_start(struct seq_file *s, loff_t *offset)
 {
-        struct ccwdev_iter *iter;
+        struct ccwdev_iter *iter = s->private;
 
         if (*offset >= (__MAX_SUBCHANNEL + 1) * (__MAX_SSID + 1))
                 return NULL;
-        iter = kzalloc(sizeof(struct ccwdev_iter), GFP_KERNEL);
-        if (!iter)
-                return ERR_PTR(-ENOMEM);
+        memset(iter, 0, sizeof(*iter));
         iter->ssid = *offset / (__MAX_SUBCHANNEL + 1);
         iter->devno = *offset % (__MAX_SUBCHANNEL + 1);
         return iter;
@@ -280,8 +278,6 @@ cio_ignore_proc_seq_start(struct seq_file *s, loff_t *offset)
 static void
 cio_ignore_proc_seq_stop(struct seq_file *s, void *it)
 {
-        if (!IS_ERR(it))
-                kfree(it);
 }
 
 static void *
@@ -378,14 +374,15 @@ static const struct seq_operations cio_ignore_proc_seq_ops = {
 static int
 cio_ignore_proc_open(struct inode *inode, struct file *file)
 {
-        return seq_open(file, &cio_ignore_proc_seq_ops);
+        return seq_open_private(file, &cio_ignore_proc_seq_ops,
+                                sizeof(struct ccwdev_iter));
 }
 
 static const struct file_operations cio_ignore_proc_fops = {
         .open    = cio_ignore_proc_open,
         .read    = seq_read,
         .llseek  = seq_lseek,
-        .release = seq_release,
+        .release = seq_release_private,
         .write   = cio_ignore_write,
 };
 
diff --git a/drivers/s390/cio/chp.c b/drivers/s390/cio/chp.c
index 40002830d48a..8ab51608da55 100644
--- a/drivers/s390/cio/chp.c
+++ b/drivers/s390/cio/chp.c
@@ -393,7 +393,6 @@ int chp_new(struct chp_id chpid)
         chp->state = 1;
         chp->dev.parent = &channel_subsystems[chpid.cssid]->device;
         chp->dev.release = chp_release;
-        dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);
 
         /* Obtain channel path description and fill it in. */
         ret = chsc_determine_base_channel_path_desc(chpid, &chp->desc);
@@ -411,6 +410,7 @@ int chp_new(struct chp_id chpid)
         } else {
                 chp->cmg = -1;
         }
+        dev_set_name(&chp->dev, "chp%x.%02x", chpid.cssid, chpid.id);
 
         /* make it known to the system */
         ret = device_register(&chp->dev);
diff --git a/drivers/s390/cio/device.c b/drivers/s390/cio/device.c
index f780bdd3a04e..2ee093ec86e4 100644
--- a/drivers/s390/cio/device.c
+++ b/drivers/s390/cio/device.c
@@ -1609,7 +1609,7 @@ int ccw_purge_blacklisted(void)
         return 0;
 }
 
-static void device_set_disconnected(struct ccw_device *cdev)
+void ccw_device_set_disconnected(struct ccw_device *cdev)
 {
         if (!cdev)
                 return;
@@ -1705,7 +1705,7 @@ static int io_subchannel_sch_event(struct subchannel *sch, int slow)
                 ccw_device_trigger_reprobe(cdev);
                 break;
         case DISC:
-                device_set_disconnected(cdev);
+                ccw_device_set_disconnected(cdev);
                 break;
         default:
                 break;
diff --git a/drivers/s390/cio/device.h b/drivers/s390/cio/device.h
index ed39a2caaf47..246c6482842c 100644
--- a/drivers/s390/cio/device.h
+++ b/drivers/s390/cio/device.h
@@ -125,6 +125,7 @@ int ccw_device_stlck(struct ccw_device *);
 void ccw_device_trigger_reprobe(struct ccw_device *);
 void ccw_device_kill_io(struct ccw_device *);
 int ccw_device_notify(struct ccw_device *, int);
+void ccw_device_set_disconnected(struct ccw_device *cdev);
 void ccw_device_set_notoper(struct ccw_device *cdev);
 
 /* qdio needs this. */
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index e728ce447f6e..b9613d7df9ef 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -387,19 +387,35 @@ ccw_device_done(struct ccw_device *cdev, int state)
 
         cdev->private->state = state;
 
-        if (state == DEV_STATE_BOXED) {
+        switch (state) {
+        case DEV_STATE_BOXED:
                 CIO_MSG_EVENT(0, "Boxed device %04x on subchannel %04x\n",
                               cdev->private->dev_id.devno, sch->schid.sch_no);
                 if (cdev->online && !ccw_device_notify(cdev, CIO_BOXED))
                         ccw_device_schedule_sch_unregister(cdev);
                 cdev->private->flags.donotify = 0;
-        }
-        if (state == DEV_STATE_NOT_OPER) {
+                break;
+        case DEV_STATE_NOT_OPER:
                 CIO_MSG_EVENT(0, "Device %04x gone on subchannel %04x\n",
                               cdev->private->dev_id.devno, sch->schid.sch_no);
                 if (!ccw_device_notify(cdev, CIO_GONE))
                         ccw_device_schedule_sch_unregister(cdev);
+                else
+                        ccw_device_set_disconnected(cdev);
                 cdev->private->flags.donotify = 0;
+                break;
+        case DEV_STATE_DISCONNECTED:
+                CIO_MSG_EVENT(0, "Disconnected device %04x on subchannel "
+                              "%04x\n", cdev->private->dev_id.devno,
+                              sch->schid.sch_no);
+                if (!ccw_device_notify(cdev, CIO_NO_PATH))
+                        ccw_device_schedule_sch_unregister(cdev);
+                else
+                        ccw_device_set_disconnected(cdev);
+                cdev->private->flags.donotify = 0;
+                break;
+        default:
+                break;
         }
 
         if (cdev->private->flags.donotify) {
@@ -671,6 +687,10 @@ ccw_device_offline(struct ccw_device *cdev)
                 ccw_device_done(cdev, DEV_STATE_NOT_OPER);
                 return 0;
         }
+        if (cdev->private->state == DEV_STATE_BOXED) {
+                ccw_device_done(cdev, DEV_STATE_BOXED);
+                return 0;
+        }
         if (ccw_device_is_orphan(cdev)) {
                 ccw_device_done(cdev, DEV_STATE_OFFLINE);
                 return 0;
@@ -730,11 +750,10 @@ ccw_device_recog_notoper(struct ccw_device *cdev, enum dev_event dev_event)
 static void ccw_device_generic_notoper(struct ccw_device *cdev,
                                        enum dev_event dev_event)
 {
-        struct subchannel *sch;
-
-        ccw_device_set_notoper(cdev);
-        sch = to_subchannel(cdev->dev.parent);
-        css_schedule_eval(sch->schid);
+        if (!ccw_device_notify(cdev, CIO_GONE))
+                ccw_device_schedule_sch_unregister(cdev);
+        else
+                ccw_device_set_disconnected(cdev);
 }
 
 /*
diff --git a/drivers/s390/crypto/zcrypt_pcixcc.c b/drivers/s390/crypto/zcrypt_pcixcc.c
index c20d4790258e..5677b40e4ac0 100644
--- a/drivers/s390/crypto/zcrypt_pcixcc.c
+++ b/drivers/s390/crypto/zcrypt_pcixcc.c
@@ -361,7 +361,7 @@ static void rng_type6CPRB_msgX(struct ap_device *ap_dev,
                 .ToCardLen1     = sizeof *msg - sizeof(msg->hdr),
                 .FromCardLen1   = sizeof *msg - sizeof(msg->hdr),
         };
-        static struct CPRBX static_cprbx = {
+        static struct CPRBX local_cprbx = {
                 .cprb_len       = 0x00dc,
                 .cprb_ver_id    = 0x02,
                 .func_id        = {0x54, 0x32},
@@ -372,7 +372,7 @@ static void rng_type6CPRB_msgX(struct ap_device *ap_dev,
 
         msg->hdr = static_type6_hdrX;
         msg->hdr.FromCardLen2 = random_number_length,
-        msg->cprbx = static_cprbx;
+        msg->cprbx = local_cprbx;
         msg->cprbx.rpl_datal = random_number_length,
         msg->cprbx.domain = AP_QID_QUEUE(ap_dev->qid);
         memcpy(msg->function_code, msg->hdr.function_code, 0x02);
@@ -561,7 +561,8 @@ static int convert_response_ica(struct zcrypt_device *zdev,
                 if (msg->cprbx.cprb_ver_id == 0x02)
                         return convert_type86_ica(zdev, reply,
                                                   outputdata, outputdatalength);
-                /* no break, incorrect cprb version is an unknown response */
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
         default: /* Unknown response type, this should NEVER EVER happen */
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */
@@ -587,7 +588,8 @@ static int convert_response_xcrb(struct zcrypt_device *zdev,
                 }
                 if (msg->cprbx.cprb_ver_id == 0x02)
                         return convert_type86_xcrb(zdev, reply, xcRB);
-                /* no break, incorrect cprb version is an unknown response */
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
         default: /* Unknown response type, this should NEVER EVER happen */
                 xcRB->status = 0x0008044DL; /* HDD_InvalidParm */
                 zdev->online = 0;
@@ -610,7 +612,8 @@ static int convert_response_rng(struct zcrypt_device *zdev,
                         return -EINVAL;
                 if (msg->cprbx.cprb_ver_id == 0x02)
                         return convert_type86_rng(zdev, reply, data);
-                /* no break, incorrect cprb version is an unknown response */
+                /* Fall through, no break, incorrect cprb version is an unknown
+                 * response */
         default: /* Unknown response type, this should NEVER EVER happen */
                 zdev->online = 0;
                 return -EAGAIN; /* repeat the request on a different device. */