packages: kernel/kernel-tuxonice.patch - updated for 2.6.34

cieciwa cieciwa at pld-linux.org
Tue May 18 14:36:21 CEST 2010


Author: cieciwa                      Date: Tue May 18 12:36:21 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 2.6.34

---- Files affected:
packages/kernel:
   kernel-tuxonice.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: packages/kernel/kernel-tuxonice.patch
diff -u packages/kernel/kernel-tuxonice.patch:1.11 packages/kernel/kernel-tuxonice.patch:1.12
--- packages/kernel/kernel-tuxonice.patch:1.11	Tue Mar 16 20:12:12 2010
+++ packages/kernel/kernel-tuxonice.patch	Tue May 18 14:36:15 2010
@@ -3172,9 +3172,9 @@
  
 +	vfs_check_frozen(dir->i_sb, SB_FREEZE_WRITE);
 +
- 	vfs_dq_init(dir);
- 
  	mutex_lock(&dentry->d_inode->i_mutex);
+ 	if (d_mountpoint(dentry))
+ 		error = -EBUSY;
 diff --git a/fs/super.c b/fs/super.c
 index aff046b..affb662 100644
 --- a/fs/super.c
@@ -4255,16 +4255,6 @@
  
  /* 
   * Timeout for stopping processes
-@@ -93,7 +100,8 @@ static int try_to_freeze_tasks(bool sig_only)
- 		do_each_thread(g, p) {
- 			task_lock(p);
- 			if (freezing(p) && !freezer_should_skip(p))
--				printk(KERN_ERR " %s\n", p->comm);
-+				printk(KERN_ERR " %s (%d) failed to freeze.\n",
-+						p->comm, p->pid);
- 			cancel_freezing(p);
- 			task_unlock(p);
- 		} while_each_thread(g, p);
 @@ -113,17 +121,26 @@ int freeze_processes(void)
  {
  	int error;
@@ -4754,7 +4744,7 @@
 +	if (toi_running)
 +		return toi_post_context_save();
 +
- 	printk(KERN_INFO "PM: Creating hibernation image: \n");
+ 	printk(KERN_INFO "PM: Creating hibernation image:\n");
  
  	drain_local_pages(NULL);
 @@ -1540,14 +1664,14 @@ asmlinkage int swsusp_save(void)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kernel/kernel-tuxonice.patch?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list