patch-2.1.119 linux/mm/swapfile.c

• Lines: 21
• Date: Wed Aug 26 16:01:57 1998
• Orig file: v2.1.118/linux/mm/swapfile.c
• Orig date: Wed Aug 26 11:37:45 1998

diff -u --recursive --new-file v2.1.118/linux/mm/swapfile.c linux/mm/swapfile.c
@@ -489,7 +489,7 @@
 	int swap_header_version;
 	int lock_map_size = PAGE_SIZE;
 	int nr_good_pages = 0;
-	char tmp_lock_map = 0;
+	unsigned long tmp_lock_map = 0;
 	
 	lock_kernel();
 	if (!capable(CAP_SYS_ADMIN))
@@ -558,9 +558,9 @@
 		goto bad_swap;
 	}
 
-	p->swap_lockmap = &tmp_lock_map;
+	p->swap_lockmap = (char *) &tmp_lock_map;
 	rw_swap_page_nocache(READ, SWP_ENTRY(type,0), (char *) swap_header);
-	p->swap_lockmap = 0;
+	p->swap_lockmap = NULL;
 
 	if (!memcmp("SWAP-SPACE",swap_header->magic.magic,10))
 		swap_header_version = 1;