Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mv-sheeva.git] / arch / powerpc / kernel / swsusp.c

diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index 064a7ba4f02c0a43e87e6ee68f96ab2ebf63f426..560c961195015d39b0f62296f48413f27f394f0f 100644 (file)
--- 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
 }