---

yaml --- r: 326229 b: refs/heads/master c: 39c9a4a h: refs/heads/master i: 326227: 0422c17 v: v3
git-mirror · Sep 27, 2012 · 77dd456 · 77dd456
1 parent cdadfc8
commit 77dd456
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0967237ca6521c63822340138e4d62ecf8a3d173
+refs/heads/master: 39c9a4ab2b91bff26801c86e423ef07fb705b3c0
diff --git a/trunk/arch/ia64/xen/xencomm.c b/trunk/arch/ia64/xen/xencomm.c
@@ -17,6 +17,7 @@
  */
 
 #include <linux/mm.h>
+#include <linux/err.h>
 
 static unsigned long kernel_virtual_offset;
 static int is_xencomm_initialized;
@@ -98,7 +99,7 @@ xencomm_vtop(unsigned long vaddr)
 
 	/* We assume the page is modified.  */
 	page = follow_page(vma, vaddr, FOLL_WRITE | FOLL_TOUCH);
-	if (!page)
+	if (IS_ERR_OR_NULL(page))
 		return ~0UL;
 
 	return (page_to_pfn(page) << PAGE_SHIFT) | (vaddr & ~PAGE_MASK);