changeset 13857:a4e0f94e01f4

2911 blkdev-related panic on DEBUG kernels Reviewed by: Richard Lowe <richlowe@richlowe.net> Reviewed by: Garrett D'Amore <garrett@damore.org> Approved by: Garrett D'Amore <garrett@damore.org>
author Alexey Zaytsev <alexey.zaytsev@gmail.com>
date Tue, 16 Oct 2012 03:33:44 -0700
parents 0a80ec57bcc9
children 1c0f1f24a6ad
files usr/src/uts/common/io/blkdev/blkdev.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/io/blkdev/blkdev.c	Fri Oct 05 17:35:59 2012 -0400
+++ b/usr/src/uts/common/io/blkdev/blkdev.c	Tue Oct 16 03:33:44 2012 -0700
@@ -20,8 +20,9 @@
  */
 /*
  * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright 2011, 2012 Nexenta Systems, Inc.  All rights reserved.
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
  * Copyright 2012 Garrett D'Amore <garrett@damore.org>.  All rights reserved.
+ * Copyright 2012 Alexey Zaytsev <alexey.zaytsev@gmail.com> All rights reserved.
  */
 
 #include <sys/types.h>
@@ -502,7 +503,7 @@
 	bd_t		*bd = arg;
 	int		(*dcb)(caddr_t);
 
-	if (kmflag == KM_SLEEP) {
+	if (kmflag == KM_PUSHPAGE || kmflag == KM_SLEEP) {
 		dcb = DDI_DMA_SLEEP;
 	} else {
 		dcb = DDI_DMA_DONTWAIT;