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 */