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

• Lines: 23
• Date: Wed Aug 15 14:21:11 2001
• Orig file: v2.4.8/linux/include/linux/swap.h
• Orig date: Sun Aug 12 13:28:01 2001

diff -u --recursive --new-file v2.4.8/linux/include/linux/swap.h linux/include/linux/swap.h
@@ -116,9 +116,7 @@
 extern wait_queue_head_t kreclaimd_wait;
 extern int page_launder(int, int);
 extern int free_shortage(void);
-extern int total_free_shortage(void);
 extern int inactive_shortage(void);
-extern int total_inactive_shortage(void);
 extern void wakeup_kswapd(void);
 extern int try_to_free_pages(unsigned int gfp_mask);
 
@@ -258,9 +256,9 @@
  * 64 (1 << INACTIVE_SHIFT) seconds.
  */
 #define INACTIVE_SHIFT 6
-#define inactive_min(a,b) ((a) < (b) ? (a) : (b))
-#define inactive_target inactive_min((memory_pressure >> INACTIVE_SHIFT), \
-		(num_physpages / 4))
+#define inactive_target min(unsigned long, \
+			    (memory_pressure >> INACTIVE_SHIFT), \
+			    (num_physpages / 4))
 
 /*
  * Ugly ugly ugly HACK to make sure the inactive lists