From e1956a3850b4511e900edd450a1193112381886b Mon Sep 17 00:00:00 2001 From: FUJITA Tomonori Date: Wed, 16 Jul 2008 20:33:35 +0200 Subject: [PATCH] --- yaml --- r: 102067 b: refs/heads/master c: 0b6abc17700a7843b165c677da0ac94522f83083 h: refs/heads/master i: 102065: 6c861e7a85be813b7f9b98ec318f70c2443e5724 102063: bb2ecb427d4b623fe25b8a8ccc4fa6fe5bae0997 v: v3 --- [refs] | 2 +- trunk/drivers/ide/ide-cd.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 76857878ad85..c9434f88f869 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84e0f3f6c1e26588fdcb9f1b0f99d0275229bc99 +refs/heads/master: 0b6abc17700a7843b165c677da0ac94522f83083 diff --git a/trunk/drivers/ide/ide-cd.c b/trunk/drivers/ide/ide-cd.c index d99847157186..d6667c36568c 100644 --- a/trunk/drivers/ide/ide-cd.c +++ b/trunk/drivers/ide/ide-cd.c @@ -1195,6 +1195,7 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) int mask = drive->queue->dma_alignment; unsigned long addr = (unsigned long)page_address(bio_page(rq->bio)); + unsigned long stack_mask = ~(THREAD_SIZE - 1); info->dma = drive->using_dma; @@ -1206,6 +1207,10 @@ static ide_startstop_t cdrom_do_block_pc(ide_drive_t *drive, struct request *rq) */ if ((rq->data_len & 15) || (addr & mask)) info->dma = 0; + + if (!((addr & stack_mask) ^ + ((unsigned long)current->stack & stack_mask))) + info->dma = 0; } /* start sending the command to the drive */