Merge Christoph's freeze cleanup patch
Linus Torvalds [Sun, 26 Jun 2005 00:16:53 +0000 (17:16 -0700)]
1  2 
Documentation/power/swsusp.txt
arch/i386/kernel/io_apic.c
include/linux/sched.h
kernel/sched.c

@@@ -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
@@@ -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;
Simple merge
diff --cc kernel/sched.c
Simple merge