Merge Christoph's freeze cleanup patch

diff --cc Documentation/power/swsusp.txt
index 8363c51831d30700c33c8a65aebded62d80f0ea6,4e1627cc5b51abe91cf776a4265484d5716e1868..7a6b7896645942d69815ee3b37594618367a9069
--- 1/Documentation/power/swsusp.txt
--- 2/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 060c4ca4d69f4fa2317cef66a5790ac3b68c1b82,2451a3a9944052d611ceb61faad79f641847a6c4..35eb8e29c485a05c6d5c6a17e8712f5ded763711
--- 1/arch/i386/kernel/io_apic.c
--- 2/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;

diff --cc include/linux/sched.h
Simple merge

diff --cc kernel/sched.c
Simple merge