From 77dd456d923d37dcd608f809d6ce04720a662cc2 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Thu, 27 Sep 2012 12:30:18 -0700
Subject: [PATCH] --- yaml --- r: 326229 b: refs/heads/master c:
 39c9a4ab2b91bff26801c86e423ef07fb705b3c0 h: refs/heads/master i:   326227:
 0422c17bd38d051497ff36fdf9f7f9975a3712e1 v: v3

---
 [refs]                        | 2 +-
 trunk/arch/ia64/xen/xencomm.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c41d8a4cbcc9..6fa9517a8978 100644
--- 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
index 1f5d7ac82e97..73d903ca2d64 100644
--- 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);