diff options
| author | Wei Yongjun <yongjun_wei@trendmicro.com.cn> | 2012-09-27 12:30:18 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2012-09-27 12:30:18 -0700 |
| commit | 39c9a4ab2b91bff26801c86e423ef07fb705b3c0 (patch) | |
| tree | 6923d05bc739e98c6af4f5e97d96c2aa4905c410 | |
| parent | 0967237ca6521c63822340138e4d62ecf8a3d173 (diff) | |
| download | kernel_goldelico_gta04-39c9a4ab2b91bff26801c86e423ef07fb705b3c0.zip kernel_goldelico_gta04-39c9a4ab2b91bff26801c86e423ef07fb705b3c0.tar.gz kernel_goldelico_gta04-39c9a4ab2b91bff26801c86e423ef07fb705b3c0.tar.bz2 | |
[IA64] xen: Fix return value check in xencomm_vtop()
In case of error, the function follow_page() returns ERR_PTR()
or NULL pointer. The NULL test in the error handling should be
replaced with IS_ERR_OR_NULL().
dpatch engine is used to auto generated this patch.
(https://github.com/weiyj/dpatch)
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -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 1f5d7ac..73d903c 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); |