From f17b856094e2f3f1c2fea510bf4b4d4df2e43136 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Mon, 5 Feb 2007 16:39:03 -0800 Subject: [PATCH] --- yaml --- r: 47799 b: refs/heads/master c: 22cfefb56b53103a99908ec63311e61c217eaffe h: refs/heads/master i: 47797: 7abb0d820e3631c0706a4d668a738fc37381ef3f 47795: 40476a76d9ed2fcc49aa6aea177bbfe223dc6486 47791: bb565b7eaaef61f1e8848a5d0db9bf298b132d28 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/scsi_lib.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a601dc57b26b..d7e368e51ad8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 44746438973e4f9ed9bdf3347e75f60f105b325a +refs/heads/master: 22cfefb56b53103a99908ec63311e61c217eaffe diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c index 503f09c2f05f..0f9b6c275417 100644 --- a/trunk/drivers/scsi/scsi_lib.c +++ b/trunk/drivers/scsi/scsi_lib.c @@ -2250,6 +2250,8 @@ void *scsi_kmap_atomic_sg(struct scatterlist *sg, int sg_count, size_t sg_len = 0, len_complete = 0; struct page *page; + WARN_ON(!irqs_disabled()); + for (i = 0; i < sg_count; i++) { len_complete = sg_len; /* Complete sg-entries */ sg_len += sg[i].length;