diff --git a/[refs] b/[refs]
index da9cf2218fc8..aa3f0dcf6c30 100644
--- 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
index cbe2c1441392..1cf88900ec4f 100644
--- 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;
 }