On Wed, Mar 05, 2008 at 06:02:03PM -0500, Josef 'Jeff' Sipek wrote:
> Signed-off-by: Josef 'Jeff' Sipek <jeffpc@xxxxxxxxxxxxxx>
> ---
> drivers/s390/block/Kconfig | 2 +-
> drivers/s390/block/dasd.c | 1 +
> 2 files changed, 2 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/s390/block/Kconfig b/drivers/s390/block/Kconfig
> index e879b21..b224a1f 100644
> --- a/drivers/s390/block/Kconfig
> +++ b/drivers/s390/block/Kconfig
> @@ -19,7 +19,7 @@ config DCSSBLK
>
> config DASD
> tristate "Support for DASD devices"
> - depends on CCW && BLOCK
> + depends on CCW && IOSCHED_DEADLINE && BLOCK
> help
> Enable this option if you want to access DASDs directly utilizing
> S/390s channel subsystem commands. This is necessary for running
> diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
> index ccf46c9..54f686d 100644
> --- a/drivers/s390/block/dasd.c
> +++ b/drivers/s390/block/dasd.c
> @@ -1956,6 +1956,7 @@ static int dasd_alloc_queue(struct dasd_block *block)
> block->request_queue->queuedata = block;
>
> elevator_exit(block->request_queue->elevator);
> + block->request_queue->elevator = NULL;
> rc = elevator_init(block->request_queue, "deadline");
> if (rc) {
> blk_cleanup_queue(block->request_queue);
Added to our patch queue with a modified description. Thanks!
--
To unsubscribe from this list: send the line "unsubscribe linux-s390" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
