---

yaml --- r: 283004 b: refs/heads/master c: c6968e7 h: refs/heads/master v: v3
git-mirror · Jan 11, 2012 · bc0d779 · bc0d779
1 parent 60206a0
commit bc0d779
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c0a32fc5a2e470d0b02597b23ad79a317735253e
+refs/heads/master: c6968e73b90c2a2fb9a32d4bad249f8f70f70125
diff --git a/trunk/kernel/power/snapshot.c b/trunk/kernel/power/snapshot.c
@@ -858,6 +858,9 @@ static struct page *saveable_highmem_page(struct zone *zone, unsigned long pfn)
 	    PageReserved(page))
 		return NULL;
 
+	if (page_is_guard(page))
+		return NULL;
+
 	return page;
 }
 
@@ -920,6 +923,9 @@ static struct page *saveable_page(struct zone *zone, unsigned long pfn)
 	    && (!kernel_page_present(page) || pfn_is_nosave(pfn)))
 		return NULL;
 
+	if (page_is_guard(page))
+		return NULL;
+
 	return page;
 }