SOURCES: kernel-desktop-ck.patch - adjust against tuxonice-3.0-rc5...

[glen]

Author: glen                         Date: Tue Apr  8 21:21:01 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- adjust against tuxonice-3.0-rc5-for-2.6.24.patch

---- Files affected:
SOURCES:
   kernel-desktop-ck.patch (1.15 -> 1.16) 

---- Diffs:

================================================================
Index: SOURCES/kernel-desktop-ck.patch
diff -u SOURCES/kernel-desktop-ck.patch:1.15 SOURCES/kernel-desktop-ck.patch:1.16
--- SOURCES/kernel-desktop-ck.patch:1.15	Tue Apr  8 22:51:41 2008
+++ SOURCES/kernel-desktop-ck.patch	Tue Apr  8 23:20:55 2008
@@ -500,13 +500,15 @@
  extern void FASTCALL(activate_page(struct page *));
  extern void FASTCALL(mark_page_accessed(struct page *));
  extern void lru_add_drain(void);
-@@ -184,9 +185,10 @@ extern void swap_setup(void);
+@@ -186,11 +186,12 @@
  
  /* linux/mm/vmscan.c */
  extern unsigned long try_to_free_pages(struct zone **zones, int order,
 -					gfp_t gfp_mask);
 +					gfp_t gfp_mask, struct task_struct *p);
  extern unsigned long shrink_all_memory(unsigned long nr_pages);
+ extern void shrink_one_zone(struct zone *zone, unsigned long desired_size,
+ 		int ps_wanted);
 -extern int vm_swappiness;
 +extern int vm_mapped;
 +extern int vm_hardmaplimit;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-desktop-ck.patch?r1=1.15&r2=1.16&f=u