patch-2.3.7 linux/include/linux/swap.h

Next file: linux/include/linux/synclink.h
Previous file: linux/include/linux/smb_fs.h
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.6/linux/include/linux/swap.h linux/include/linux/swap.h
@@ -67,7 +67,7 @@
 extern int nr_free_pages;
 extern atomic_t nr_async_pages;
 extern struct inode swapper_inode;
-extern unsigned long page_cache_size;
+extern atomic_t page_cache_size;
 extern int buffermem;
 
 /* Incomplete types for prototype declarations: */
@@ -107,6 +107,7 @@
 /*
  * Make these inline later once they are working properly.
  */
+extern void __delete_from_swap_cache(struct page *page);
 extern void delete_from_swap_cache(struct page *page);
 extern void free_page_and_swap_cache(unsigned long addr);
 
@@ -163,7 +164,7 @@
 	unsigned int count;
 	if (PageReserved(page))
 		return 1;
-	count = atomic_read(&page->count);
+	count = page_count(page);
 	if (PageSwapCache(page))
 		count += swap_count(page->offset) - 2;
 	if (PageFreeAfter(page))

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)