.. | .. |
---|
40 | 40 | #include <linux/highmem.h> |
---|
41 | 41 | #include <linux/io.h> |
---|
42 | 42 | #include <linux/jiffies.h> |
---|
43 | | -#include <asm/pgtable.h> |
---|
44 | 43 | #include <linux/delay.h> |
---|
45 | 44 | #include <linux/export.h> |
---|
46 | 45 | #include <linux/uio.h> |
---|
| 46 | +#include <linux/pgtable.h> |
---|
47 | 47 | |
---|
48 | 48 | #include <rdma/ib.h> |
---|
49 | 49 | |
---|
.. | .. |
---|
343 | 343 | |
---|
344 | 344 | /* virtual address of first page in transfer */ |
---|
345 | 345 | vaddr = ti->tidvaddr; |
---|
346 | | - if (!access_ok(VERIFY_WRITE, (void __user *) vaddr, |
---|
| 346 | + if (!access_ok((void __user *) vaddr, |
---|
347 | 347 | cnt * PAGE_SIZE)) { |
---|
348 | 348 | ret = -EFAULT; |
---|
349 | 349 | goto done; |
---|
.. | .. |
---|
1789 | 1789 | |
---|
1790 | 1790 | static int qib_close(struct inode *in, struct file *fp) |
---|
1791 | 1791 | { |
---|
1792 | | - int ret = 0; |
---|
1793 | 1792 | struct qib_filedata *fd; |
---|
1794 | 1793 | struct qib_ctxtdata *rcd; |
---|
1795 | 1794 | struct qib_devdata *dd; |
---|
.. | .. |
---|
1873 | 1872 | |
---|
1874 | 1873 | bail: |
---|
1875 | 1874 | kfree(fd); |
---|
1876 | | - return ret; |
---|
| 1875 | + return 0; |
---|
1877 | 1876 | } |
---|
1878 | 1877 | |
---|
1879 | 1878 | static int qib_ctxt_info(struct file *fp, struct qib_ctxt_info __user *uinfo) |
---|