X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=arch%2Fpowerpc%2Fkernel%2Fswsusp.c;h=560c961195015d39b0f62296f48413f27f394f0f;hb=5e696617c425eb97bd943d781f3941fb1e8f0e5b;hp=064a7ba4f02c0a43e87e6ee68f96ab2ebf63f426;hpb=4750def52cb2c21732dda9aa1d43a07db37b0186;p=deliverable%2Flinux.git

diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index 064a7ba4f02c..560c96119501 100644
--- a/arch/powerpc/kernel/swsusp.c
+++ b/arch/powerpc/kernel/swsusp.c
@@ -34,10 +34,6 @@ void save_processor_state(void)
 void restore_processor_state(void)
 {
 #ifdef CONFIG_PPC32
-	set_context(current->active_mm->context.id, current->active_mm->pgd);
-#endif
-
-#ifdef CONFIG_PPC64
-	hard_irq_enable();
+	switch_mmu_context(NULL, current->active_mm);
 #endif
 }