[lc-checkins] CVS: linux/include/linux comp_cache.h,1.28,1.29 swap.h,1.10,1.11

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

Update of /cvsroot/linuxcompressed/linux/include/linux
In directory usw-pr-cvs1:/tmp/cvs-serv2127/include/linux

Modified Files:
	comp_cache.h swap.h 
Log Message:
- In 2.4.10 the MAX_SWAPFILES was changed, what caused some problems for our
code in architectures like UML, which handles swap entry addresses
differently than in i386. That way, we cannot keep using MAX_SWAPFILES for
our swap type unless we decrease this variable. In this case, we decreased
the variable to 31 and so we can use 31 as COMP_CACHE_SWP_TYPE without
worrying about arch-dependent configuration. Nevertheless, we are limited to
31 swap files, not 32 as in vanilla.



Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** comp_cache.h	2001/10/01 22:43:59	1.28
--- comp_cache.h	2001/10/08 14:56:35	1.29
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2001-10-01 18:25:53 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2001-10-06 17:17:13 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache

Index: swap.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/swap.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** swap.h	2001/09/29 20:30:14	1.10
--- swap.h	2001/10/08 14:56:35	1.11
***************
*** 9,13 ****
--- 9,23 ----
  #define SWAP_FLAG_PRIO_SHIFT	0
  
+ #ifdef CONFIG_COMP_CACHE
+ 
+ /* some architectures may deal with SWP_ENTRY differently, such as
+  * UML. Use MAX_SWAPFILES for COMP_CACHE_SWP_TYPE may cause problems,
+  * so let's decrease the maximum number in order to use safely the
+  * last swap file type (in this case 31) */
+ #define MAX_SWAPFILES 31
+ 
+ #else
  #define MAX_SWAPFILES 32
+ #endif
  
  /*