projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[cascardo/linux.git]
/
arch
/
ia64
/
xen
/
xencomm.c
diff --git
a/arch/ia64/xen/xencomm.c
b/arch/ia64/xen/xencomm.c
index
1f5d7ac
..
73d903c
100644
(file)
--- a/
arch/ia64/xen/xencomm.c
+++ b/
arch/ia64/xen/xencomm.c
@@
-17,6
+17,7
@@
*/
#include <linux/mm.h>
*/
#include <linux/mm.h>
+#include <linux/err.h>
static unsigned long kernel_virtual_offset;
static int is_xencomm_initialized;
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);
/* 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);
return ~0UL;
return (page_to_pfn(page) << PAGE_SHIFT) | (vaddr & ~PAGE_MASK);