[lc-checkins] CVS: linux/mm page_alloc.c,1.20,1.21

[Rodrigo S. de C. <rc...@us...>]

Update of /cvsroot/linuxcompressed/linux/mm
In directory usw-pr-cvs1:/tmp/cvs-serv25032/mm

Modified Files:
	page_alloc.c 
Log Message:
Bug fixes:
o Fixed bug in shrink_comp_cache() which would release a NULL page
o "Fixed" potential bug when unable to allocate page for ptes (vswap)
by pre-allocating one page when initializing compressed cache
o Fixed bug which would cause an oops when fixing memory
watermarks. All zone_balance_* arrays were defined as __initdata, so
they could be accessed by our function after being deallocated. The
fix simply removes the __initdata option from their declaration when
compressed cache is enabled.

Other:
o cleanups in adaptivity.c



Index: page_alloc.c
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/mm/page_alloc.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** page_alloc.c	18 Jun 2002 12:47:21 -0000	1.20
--- page_alloc.c	18 Jun 2002 18:04:31 -0000	1.21
***************
*** 29,35 ****
--- 29,41 ----
  
  static char *zone_names[MAX_NR_ZONES] = { "DMA", "Normal", "HighMem" };
+ #ifdef CONFIG_COMP_CACHE
+ static int zone_balance_ratio[MAX_NR_ZONES] = { 128, 128, 128, };
+ static int zone_balance_min[MAX_NR_ZONES] = { 20 , 20, 20, };
+ static int zone_balance_max[MAX_NR_ZONES] = { 255 , 255, 255, };
+ #else
  static int zone_balance_ratio[MAX_NR_ZONES] __initdata = { 128, 128, 128, };
  static int zone_balance_min[MAX_NR_ZONES] __initdata = { 20 , 20, 20, };
  static int zone_balance_max[MAX_NR_ZONES] __initdata = { 255 , 255, 255, };
+ #endif
  
  /*