Messages in this thread Patch in this message | | | Subject | [PATCH] [8/48] Suspend2 2.1.9.8 for 2.6.12: 353-disable-highmem-tlb-flush-for-copyback.patch | Date | Wed, 6 Jul 2005 12:20:40 +1000 | From | Nigel Cunningham <> |
| |
diff -ruNp 354-disable-mce-checking-during-suspend-avoid-smp-deadlock.patch-old/arch/i386/kernel/cpu/mcheck/non-fatal.c 354-disable-mce-checking-during-suspend-avoid-smp-deadlock.patch-new/arch/i386/kernel/cpu/mcheck/non-fatal.c --- 354-disable-mce-checking-during-suspend-avoid-smp-deadlock.patch-old/arch/i386/kernel/cpu/mcheck/non-fatal.c 2004-12-10 14:26:18.000000000 +1100 +++ 354-disable-mce-checking-during-suspend-avoid-smp-deadlock.patch-new/arch/i386/kernel/cpu/mcheck/non-fatal.c 2005-07-04 23:14:20.000000000 +1000 @@ -17,6 +17,7 @@ #include <linux/interrupt.h> #include <linux/smp.h> #include <linux/module.h> +#include <linux/suspend.h> #include <asm/processor.h> #include <asm/system.h> @@ -58,7 +59,8 @@ static DECLARE_WORK(mce_work, mce_work_f static void mce_work_fn(void *data) { - on_each_cpu(mce_checkregs, NULL, 1, 1); + if (!test_suspend_state(SUSPEND_RUNNING)) + on_each_cpu(mce_checkregs, NULL, 1, 1); schedule_delayed_work(&mce_work, MCE_RATE); } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |