diff --git a/fs/aio.c b/fs/aio.c
index 2bbcacf74d0c64f8814cb68d8c4eff423dfe98d4..a8ecc8313fb08d310276e72043e671c186ad1565 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -39,6 +39,8 @@
 #include <asm/kmap_types.h>
 #include <asm/uaccess.h>
 
+#include "internal.h"
+
 #define AIO_RING_MAGIC			0xa10a10a1
 #define AIO_RING_COMPAT_FEATURES	1
 #define AIO_RING_INCOMPAT_FEATURES	0
diff --git a/fs/internal.h b/fs/internal.h
index f6ad343628233b58006412ee59e31d3e0bc88afa..7c5f01cf619d689d76ab51cc7cc221bead874cf4 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -131,6 +131,7 @@ extern struct dentry *__d_alloc(struct super_block *, const struct qstr *);
  * read_write.c
  */
 extern ssize_t __kernel_write(struct file *, const char *, size_t, loff_t *);
+extern int rw_verify_area(int, struct file *, const loff_t *, size_t);
 
 /*
  * splice.c
diff --git a/fs/read_write.c b/fs/read_write.c
index 782dfc3acebcf038db62116ab65536fc28ed8a6a..fd72b592aa1b4a1d96841abedc86da5a67c3535b 100644
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -316,7 +316,7 @@ SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned long, offset_high,
  * them to something that fits in "int" so that others
  * won't have to do range checks all the time.
  */
-int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
+int rw_verify_area(int read_write, struct file *file, const loff_t *ppos, size_t count)
 {
 	struct inode *inode;
 	loff_t pos;
diff --git a/include/linux/fs.h b/include/linux/fs.h
index 803b7fa2520a088378940acc79f45977e0ddca37..68f10204ab29551a0964ca830de26cfd8c144301 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1898,7 +1898,6 @@ extern int current_umask(void);
 extern struct kobject *fs_kobj;
 
 #define MAX_RW_COUNT (INT_MAX & PAGE_CACHE_MASK)
-extern int rw_verify_area(int, struct file *, loff_t *, size_t);
 
 #define FLOCK_VERIFY_READ  1
 #define FLOCK_VERIFY_WRITE 2