x86: Issue at least one memory barrier in stop_machine_text_poke()

[safe/jmp/linux-2.6] / arch / powerpc / kernel / swsusp.c

diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index b89e4f5..560c961 100644 (file)
--- a/arch/powerpc/kernel/swsusp.c
+++ b/arch/powerpc/kernel/swsusp.c
@@ -24,11 +24,16 @@ void save_processor_state(void)
        flush_fp_to_thread(current);
        flush_altivec_to_thread(current);
        flush_spe_to_thread(current);
+
+#ifdef CONFIG_PPC64
+       hard_irq_disable();
+#endif
+
 }
 
 void restore_processor_state(void)
 {
 #ifdef CONFIG_PPC32
-       set_context(current->active_mm->context.id, current->active_mm->pgd);
+       switch_mmu_context(NULL, current->active_mm);
 #endif
 }