From 9f54b9be6933af08a47fc50f66aa4090de685b06 Mon Sep 17 00:00:00 2001 From: "akpm@osdl.org" Date: Tue, 9 Aug 2005 00:17:03 -0700 Subject: [PATCH] --- yaml --- r: 7690 b: refs/heads/master c: 6becdff3bcaff1b89c392cf0630dcb5759704492 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ab783d08cd2f..bcab6e767691 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a1c1d446b7cac6ddd8f6b1f3254ccffe87f1751 +refs/heads/master: 6becdff3bcaff1b89c392cf0630dcb5759704492 diff --git a/trunk/drivers/scsi/scsi.c b/trunk/drivers/scsi/scsi.c index 4befbc275f94..a780546eda9c 100644 --- a/trunk/drivers/scsi/scsi.c +++ b/trunk/drivers/scsi/scsi.c @@ -811,7 +811,7 @@ static void scsi_softirq(struct softirq_action *h) if (disposition != SUCCESS && time_before(cmd->jiffies_at_alloc + wait_for, jiffies)) { dev_printk(KERN_ERR, &cmd->device->sdev_gendev, - "timing out command, waited %ds\n", + "timing out command, waited %lus\n", wait_for/HZ); disposition = SUCCESS; }