[lc-checkins] CVS: linux/include/linux comp_cache.h,1.85,1.86

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

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

Modified Files:
	comp_cache.h 
Log Message:
Bug fix
o Fixed bug that wouldn't allow the code to be compiled without compressed
cache enabled.



Index: comp_cache.h
===================================================================
RCS file: /cvsroot/linuxcompressed/linux/include/linux/comp_cache.h,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** comp_cache.h	1 Jul 2002 17:37:28 -0000	1.85
--- comp_cache.h	1 Jul 2002 18:44:40 -0000	1.86
***************
*** 2,6 ****
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-07-01 13:09:35 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
--- 2,6 ----
   * linux/mm/comp_cache.h
   *
!  * Time-stamp: <2002-07-01 15:29:46 rcastro>
   *  
   * Linux Virtual Memory Compressed Cache
***************
*** 104,108 ****
  #else
  static inline int shrink_comp_cache(struct comp_cache_page * comp_page, int check_further) { return 0; }
! static inline void grow_comp_cache(zone_t * zone, int nr_pages) { }
  #endif
  
--- 104,108 ----
  #else
  static inline int shrink_comp_cache(struct comp_cache_page * comp_page, int check_further) { return 0; }
! static inline void grow_comp_cache(int nrpages) { }
  #endif
  
***************
*** 352,363 ****
  #ifdef CONFIG_COMP_PAGE_CACHE
  void steal_page_from_comp_cache(struct page *, struct page *);
- #ifndef CONFIG_COMP_DEMAND_RESIZE
- int  comp_cache_try_to_release_page(struct page **, int, int);
  #else
! static inline int comp_cache_try_to_release_page(struct page ** page, int gfp_mask, int priority) { return try_to_release_page(*page, gfp_mask); }
  #endif
  #else
  static inline int comp_cache_try_to_release_page(struct page ** page, int gfp_mask, int priority) { return try_to_release_page(*page, gfp_mask); }
- static inline void steal_page_from_comp_cache(struct page * page, struct page * new_page) {};
  #endif
  
--- 352,363 ----
  #ifdef CONFIG_COMP_PAGE_CACHE
  void steal_page_from_comp_cache(struct page *, struct page *);
  #else
! static inline void steal_page_from_comp_cache(struct page * page, struct page * new_page) {};
  #endif
+ 
+ #if defined(CONFIG_COMP_PAGE_CACHE) && !defined(CONFIG_COMP_DEMAND_RESIZE)
+ int  comp_cache_try_to_release_page(struct page **, int, int);
  #else
  static inline int comp_cache_try_to_release_page(struct page ** page, int gfp_mask, int priority) { return try_to_release_page(*page, gfp_mask); }
  #endif
  
***************
*** 435,438 ****
--- 435,441 ----
  
  static inline int comp_cache_available_space(void) { return 0; }
+ 
+ static inline void set_vswap_allocating(swp_entry_t entry) { };
+ static inline void clear_vswap_allocating(swp_entry_t entry) { };
  
  static inline void add_pte_vswap(pte_t * ptep, swp_entry_t entry) {};