From 4a7565278e172a5faa317fc3a9ad216690b1f075 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Wed, 31 May 2006 18:27:52 +0900 Subject: [PATCH] --- yaml --- r: 29487 b: refs/heads/master c: 9a1004d0c11be41c83d06a67dfe74567a41ae582 h: refs/heads/master i: 29485: f63dd5c25ea1dfac8927c75ba3ae6b773720d393 29483: 578b5eaa1f0b1f265f0b33d0751e1b1d57b5c413 29479: 4f8302a1b4420ee9c4d12f99b1c0f121b400cd99 29471: f96488882cb13a433229aaefbd2ec40b969070e8 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 6 +++--- trunk/include/linux/libata.h | 2 ++ 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 97fd716057ba..6ca0a62379af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 664faf09a05d74085c0b31e2c621d7647322325b +refs/heads/master: 9a1004d0c11be41c83d06a67dfe74567a41ae582 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 2531a701d6e9..c965eea3b3d4 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -4140,9 +4140,8 @@ static void ata_hsm_qc_complete(struct ata_queued_cmd *qc, int in_wq) * RETURNS: * 1 when poll next status needed, 0 otherwise. */ - -static int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, - u8 status, int in_wq) +int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, + u8 status, int in_wq) { unsigned long flags = 0; int poll_next; @@ -5885,6 +5884,7 @@ EXPORT_SYMBOL_GPL(ata_device_add); EXPORT_SYMBOL_GPL(ata_host_set_remove); EXPORT_SYMBOL_GPL(ata_sg_init); EXPORT_SYMBOL_GPL(ata_sg_init_one); +EXPORT_SYMBOL_GPL(ata_hsm_move); EXPORT_SYMBOL_GPL(ata_qc_complete); EXPORT_SYMBOL_GPL(ata_qc_complete_multiple); EXPORT_SYMBOL_GPL(ata_qc_issue_prot); diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index fe5f53943c44..a1ceb5b67b97 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -723,6 +723,8 @@ extern void ata_bmdma_drive_eh(struct ata_port *ap, ata_prereset_fn_t prereset, ata_postreset_fn_t postreset); extern void ata_bmdma_error_handler(struct ata_port *ap); extern void ata_bmdma_post_internal_cmd(struct ata_queued_cmd *qc); +extern int ata_hsm_move(struct ata_port *ap, struct ata_queued_cmd *qc, + u8 status, int in_wq); extern void ata_qc_complete(struct ata_queued_cmd *qc); extern int ata_qc_complete_multiple(struct ata_port *ap, u32 qc_active, void (*finish_qc)(struct ata_queued_cmd *));