From 9d1664d7774277d2bead8f77f3212df72164a734 Mon Sep 17 00:00:00 2001
From: Hans-Joachim Picht <hans@linux.vnet.ibm.com>
Date: Tue, 16 Jun 2009 10:30:26 +0200
Subject: [PATCH] --- yaml --- r: 151102 b: refs/heads/master c:
 7db11a363fc41cec170a94a3542031e5e64bb333 h: refs/heads/master v: v3

---
 [refs]                       |  2 +-
 trunk/arch/s390/mm/pgtable.c | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8a6fd8f5dd2d..c6d573395c93 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d41dd122acf960db78c9ddc87684b43751dd36d9
+refs/heads/master: 7db11a363fc41cec170a94a3542031e5e64bb333
diff --git a/trunk/arch/s390/mm/pgtable.c b/trunk/arch/s390/mm/pgtable.c
index 4ca8e826bf30..565667207985 100644
--- a/trunk/arch/s390/mm/pgtable.c
+++ b/trunk/arch/s390/mm/pgtable.c
@@ -313,3 +313,22 @@ int s390_enable_sie(void)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
+
+#ifdef CONFIG_DEBUG_PAGEALLOC
+#ifdef CONFIG_HIBERNATION
+bool kernel_page_present(struct page *page)
+{
+	unsigned long addr;
+	int cc;
+
+	addr = page_to_phys(page);
+	asm("lra %1,0(%1)\n"
+	    "ipm %0\n"
+	    "srl %0,28"
+	    :"=d"(cc),"+a"(addr)::"cc");
+	return cc == 0;
+}
+
+#endif /* CONFIG_HIBERNATION */
+#endif /* CONFIG_DEBUG_PAGEALLOC */
+