From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 26 Jun 2005 00:16:53 +0000 (-0700)
Subject: Merge Christoph's freeze cleanup patch
X-Git-Tag: v2.6.13-rc1~68^2~7
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=2031d0f586839bc68f35bcf8580b18947f8491d4;p=powerpc.git

Merge Christoph's freeze cleanup patch
---

2031d0f586839bc68f35bcf8580b18947f8491d4
diff --cc Documentation/power/swsusp.txt
index 8363c51831,4e1627cc5b..7a6b789664
--- a/Documentation/power/swsusp.txt
+++ b/Documentation/power/swsusp.txt
@@@ -164,11 -164,10 +164,11 @@@ place where the thread is safe to be fr
  should be held at that point and it must be safe to sleep there), and
  add:
  
- 	try_to_freeze(PF_FREEZE);
 -            try_to_freeze();
++       try_to_freeze();
  
  If the thread is needed for writing the image to storage, you should
 -instead set the PF_NOFREEZE process flag when creating the thread.
 +instead set the PF_NOFREEZE process flag when creating the thread (and
 +be very carefull).
  
  
  Q: What is the difference between between "platform", "shutdown" and
diff --cc arch/i386/kernel/io_apic.c
index 060c4ca4d6,2451a3a994..35eb8e29c4
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@@ -573,10 -573,9 +573,10 @@@ static int balanced_irq(void *unused
  	for ( ; ; ) {
  		set_current_state(TASK_INTERRUPTIBLE);
  		time_remaining = schedule_timeout(time_remaining);
- 		try_to_freeze(PF_FREEZE);
+ 		try_to_freeze();
  		if (time_after(jiffies,
  				prev_balance_time+balanced_irq_interval)) {
 +			preempt_disable();
  			do_irq_balance();
  			prev_balance_time = jiffies;
  			time_remaining = balanced_irq_interval;