[lc-checkins] CVS: linux/include/linux comp_cache.h,1.101,1.102 swap.h,1.16,1.17

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

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

Modified Files:
	comp_cache.h swap.h 
Log Message:
Bug fixes:
o Make the code compile with the compressed cache option disabled.


Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -C2 -r1.101 -r1.102
*** comp_cache.h	10 Sep 2002 16:43:03 -0000	1.101
--- comp_cache.h	10 Sep 2002 17:23:55 -0000	1.102
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-09-06 19:25:59 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-09-10 14:05:49 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 241,244 ****
--- 241,246 ----
  
  extern int clean_page_compress_lock;
+ #else
+ static inline void decompress_swap_cache_page(struct page * page) { };
  #endif
  

Index: swap.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/swap.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** swap.h	10 Sep 2002 16:43:04 -0000	1.16
--- swap.h	10 Sep 2002 17:23:56 -0000	1.17
***************
*** 73,79 ****
  #define swap_map_count(swap)    (swap & 0x7fff)
  #else
! #define SWAP_MAP_MAX	0x7fff
! #define SWAP_MAP_BAD	0x8000
! #define SWAP_MAP_COMP   0x0000
  #define swap_map_count(swap)    (swap)
  #endif
--- 73,80 ----
  #define swap_map_count(swap)    (swap & 0x7fff)
  #else
! #define SWAP_MAP_MAX	        0x7fff
! #define SWAP_MAP_BAD	        0x8000
! #define SWAP_MAP_COMP           0x0000
! #define SWAP_MAP_COMP_BIT       0x0000
  #define swap_map_count(swap)    (swap)
  #endif