diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:56:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-01 13:56:35 -0700 |
| commit | a57d985e378ca69f430b85852e4187db3698a89e (patch) | |
| tree | 01fbc23313959d20fcd4e7385ef5a056b47c1828 /arch/ia64/xen/xencomm.c | |
| parent | cdeb9b014331af4282be522824e36f3aa33f0671 (diff) | |
| parent | 39c9a4ab2b91bff26801c86e423ef07fb705b3c0 (diff) | |
Merge tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 update from Tony Luck:
"Usual mish-mash of ia64 fixes for next merge window"
* tag 'please-pull-ia64-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
[IA64] xen: Fix return value check in xencomm_vtop()
[IA64] Must enable interrupts in do_notify_resume_user before calling tracehook_notify_resume()
[IA64] kexec: Move the dereference below the NULL test
[IA64] Fix a node distance bug
Diffstat (limited to 'arch/ia64/xen/xencomm.c')
| -rw-r--r-- | arch/ia64/xen/xencomm.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/ia64/xen/xencomm.c b/arch/ia64/xen/xencomm.c index 1f5d7ac82e9..73d903ca2d6 100644 --- a/arch/ia64/xen/xencomm.c +++ b/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); |