Merge with Linux 2.4.0-test2.

1 files changed, 3 insertions, 4 deletions

diff --git a/fs/ramfs/inode.c b/fs/ramfs/inode.c
index 2a1a7423d..f87d30e0b 100644
--- a/fs/ramfs/inode.c
+++ b/fs/ramfs/inode.c
@@ -22,14 +22,13 @@
  * caches is sufficient.
  */
 
-
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 #include <linux/init.h>
 #include <linux/string.h>
 #include <linux/locks.h>
-#include <linux/highmem.h>
+
 #include <asm/uaccess.h>
 
 /* some random number */
@@ -66,8 +65,7 @@ static struct dentry * ramfs_lookup(struct inode *dir, struct dentry *dentry)
 static int ramfs_readpage(struct file *file, struct page * page)
 {
 	if (!Page_Uptodate(page)) {
-		memset((void *) kmap(page), 0, PAGE_CACHE_SIZE);
-		kunmap(page);
+		memset((void *) page_address(page), 0, PAGE_CACHE_SIZE);
 		SetPageUptodate(page);
 	}
 	UnlockPage(page);
@@ -88,6 +86,7 @@ static int ramfs_prepare_write(struct file *file, struct page *page, unsigned of
 {
 	void *addr;
 
+	addr = (void *) kmap(page);
 	if (!Page_Uptodate(page)) {
 		memset(addr, 0, PAGE_CACHE_SIZE);
 		SetPageUptodate(page);