patch-2.0.21-2.1.0 linux/mm/filemap.c

Next file: linux/mm/kmalloc.c
Previous file: linux/kernel/sysctl.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file lx2.0/v2.0.21/linux/mm/filemap.c linux/mm/filemap.c
@@ -129,7 +129,7 @@
 {
 	static int clock = 0;
 	struct page * page;
-	unsigned long limit = MAP_NR(high_memory);
+	unsigned long limit = max_mapnr;
 	struct buffer_head *tmp, *bh;
 	int count_max, count_min;
 
@@ -566,7 +566,8 @@
  * of the logic when it comes to error handling etc.
  */
 
-int generic_file_read(struct inode * inode, struct file * filp, char * buf, int count)
+long generic_file_read(struct inode * inode, struct file * filp,
+	char * buf, unsigned long count)
 {
 	int error, read;
 	unsigned long pos, ppos, page_cache;

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov