[PATCH] Eliminate compile warnings from min() in mm

From: Stephen Hemminger (shemminger@osdl.org)
Date: Wed Feb 12 2003 - 18:16:40 EST


The following gets rid of the warnings:

mm/vmscan.c: In function `shrink_caches':
mm/vmscan.c:768: warning: duplicate `const'
mm/swap_state.c: In function `free_pages_and_swap_cache':
mm/swap_state.c:302: warning: duplicate `const'

diff -Nru a/mm/swap_state.c b/mm/swap_state.c
--- a/mm/swap_state.c Wed Feb 12 14:20:26 2003
+++ b/mm/swap_state.c Wed Feb 12 14:20:26 2003
@@ -294,7 +294,7 @@
  */
 void free_pages_and_swap_cache(struct page **pages, int nr)
 {
- const int chunk = 16;
+ int chunk = 16;
         struct page **pagep = pages;
 
         lru_add_drain();
diff -Nru a/mm/vmscan.c b/mm/vmscan.c
--- a/mm/vmscan.c Wed Feb 12 14:20:26 2003
+++ b/mm/vmscan.c Wed Feb 12 14:20:26 2003
@@ -765,7 +765,7 @@
 
         first_classzone = classzone->zone_pgdat->node_zones;
         for (zone = classzone; zone >= first_classzone; zone--) {
- int to_reclaim = max(nr_pages, SWAP_CLUSTER_MAX);
+ int to_reclaim = max_t(int, nr_pages, SWAP_CLUSTER_MAX);
                 int nr_mapped = 0;
                 int max_scan;
 

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sat Feb 15 2003 - 22:00:45 EST