Merge Christoph's freeze cleanup patch

2 files changed, 2 insertions, 4 deletions

diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 060c4ca4d69f..35eb8e29c485 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -573,7 +573,7 @@ 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();
diff --git a/arch/i386/kernel/signal.c b/arch/i386/kernel/signal.c
index b9b8f4e20fad..ac5b1e975c5c 100644
--- a/arch/i386/kernel/signal.c
+++ b/arch/i386/kernel/signal.c
@@ -608,10 +608,8 @@ int fastcall do_signal(struct pt_regs *regs, sigset_t *oldset)
         if (!user_mode(regs))
                 return 1;
 
-        if (current->flags & PF_FREEZE) {
-                refrigerator(0);
+        if (try_to_freeze)
                 goto no_signal;
-        }
 
         if (!oldset)
                 oldset = &current->blocked;