diff --git a/[refs] b/[refs]
index ac9c03083e0d..1e4a45f5d93f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35d40952dba7b0689a16bd1463fb7698f8dbe639
+refs/heads/master: 9537a48ed4b9e4b738943d6da0a0fd4278adf905
diff --git a/trunk/lib/dma-debug.c b/trunk/lib/dma-debug.c
index f9e6d38b4b34..1a992089486c 100644
--- a/trunk/lib/dma-debug.c
+++ b/trunk/lib/dma-debug.c
@@ -722,10 +722,11 @@ void debug_dma_map_page(struct device *dev, struct page *page, size_t offset,
 	entry->size      = size;
 	entry->direction = direction;
 
-	if (map_single) {
-		void *addr = ((char *)page_address(page)) + offset;
-
+	if (map_single)
 		entry->type = dma_debug_single;
+
+	if (!PageHighMem(page)) {
+		void *addr = ((char *)page_address(page)) + offset;
 		check_for_stack(dev, addr);
 		check_for_illegal_area(dev, addr, size);
 	}
@@ -779,8 +780,10 @@ void debug_dma_map_sg(struct device *dev, struct scatterlist *sg,
 		entry->sg_call_ents   = nents;
 		entry->sg_mapped_ents = mapped_ents;
 
-		check_for_stack(dev, sg_virt(s));
-		check_for_illegal_area(dev, sg_virt(s), s->length);
+		if (!PageHighMem(sg_page(s))) {
+			check_for_stack(dev, sg_virt(s));
+			check_for_illegal_area(dev, sg_virt(s), s->length);
+		}
 
 		add_dma_entry(entry);
 	}