The patch titled
s390: tape 3590 changes
has been added to the -mm tree. Its filename is
s390-tape-3590-changes.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
From: Stefan Bader <shbader@xxxxxxxxxx>
Added some changes that where proposed by Andrew Morton. Added 3592 device
type.
Signed-off-by: Stefan Bader <shbader@xxxxxxxxxx>
Signed-off-by: Martin Schwidefsky <schwidefsky@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/char/tape_3590.c | 22 +++++++++++-----------
drivers/s390/char/tape_std.h | 1 +
2 files changed, 12 insertions(+), 11 deletions(-)
diff -puN drivers/s390/char/tape_3590.c~s390-tape-3590-changes drivers/s390/char/tape_3590.c
--- 25/drivers/s390/char/tape_3590.c~s390-tape-3590-changes Mon Apr 24 16:46:05 2006
+++ 25-akpm/drivers/s390/char/tape_3590.c Mon Apr 24 16:46:05 2006
@@ -230,14 +230,16 @@ tape_3590_read_attmsg(struct tape_device
* These functions are used to schedule follow-up actions from within an
* interrupt context (like unsolicited interrupts).
*/
+struct work_handler_data {
+ struct tape_device *device;
+ enum tape_op op;
+ struct work_struct work;
+};
+
static void
tape_3590_work_handler(void *data)
{
- struct {
- struct tape_device *device;
- enum tape_op op;
- struct work_struct work;
- } *p = data;
+ struct work_handler_data *p = data;
switch (p->op) {
case TO_MSEN:
@@ -257,11 +259,7 @@ tape_3590_work_handler(void *data)
static int
tape_3590_schedule_work(struct tape_device *device, enum tape_op op)
{
- struct {
- struct tape_device *device;
- enum tape_op op;
- struct work_struct work;
- } *p;
+ struct work_handler_data *p;
if ((p = kzalloc(sizeof(*p), GFP_ATOMIC)) == NULL)
return -ENOMEM;
@@ -316,7 +314,7 @@ tape_3590_bread(struct tape_device *devi
rq_for_each_bio(bio, req) {
bio_for_each_segment(bv, bio, i) {
- dst = kmap(bv->bv_page) + bv->bv_offset;
+ dst = page_address(bv->bv_page) + bv->bv_offset;
for (off = 0; off < bv->bv_len;
off += TAPEBLOCK_HSEC_SIZE) {
ccw->flags = CCW_FLAG_CC;
@@ -1168,6 +1166,7 @@ tape_3590_setup_device(struct tape_devic
static void
tape_3590_cleanup_device(struct tape_device *device)
{
+ flush_scheduled_work();
tape_std_unassign(device);
kfree(device->discdata);
@@ -1234,6 +1233,7 @@ static struct tape_discipline tape_disci
static struct ccw_device_id tape_3590_ids[] = {
{CCW_DEVICE_DEVTYPE(0x3590, 0, 0x3590, 0), .driver_info = tape_3590},
+ {CCW_DEVICE_DEVTYPE(0x3592, 0, 0x3592, 0), .driver_info = tape_3592},
{ /* end of list */ }
};
diff -puN drivers/s390/char/tape_std.h~s390-tape-3590-changes drivers/s390/char/tape_std.h
--- 25/drivers/s390/char/tape_std.h~s390-tape-3590-changes Mon Apr 24 16:46:05 2006
+++ 25-akpm/drivers/s390/char/tape_std.h Mon Apr 24 16:46:05 2006
@@ -153,6 +153,7 @@ enum s390_tape_type {
tape_3480,
tape_3490,
tape_3590,
+ tape_3592,
};
#endif // _TAPE_STD_H
_
Patches currently in -mm which might be from shbader@xxxxxxxxxx are
s390-enable-interrupts-on-error-path.patch
s390-tape-3590-changes.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
