summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/swsusp.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes@sipsolutions.net>2007-05-03 22:31:38 +1000
committerPaul Mackerras <paulus@samba.org>2007-05-07 20:31:14 +1000
commit543b9fd3528f64c4b20439de0edb453764482de7 (patch)
tree50271e7d5365b088bea63a5a2938aedf3aa87741 /arch/powerpc/kernel/swsusp.c
parent7e11580b362fc64693de7ad5c11fbf3d1d9d0e50 (diff)
downloadblackbird-op-linux-543b9fd3528f64c4b20439de0edb453764482de7.tar.gz
blackbird-op-linux-543b9fd3528f64c4b20439de0edb453764482de7.zip
[POWERPC] powermac: Suspend to disk on G5
Powermac G5 suspend to disk implementation. The code is platform agnostic but only tested on powermac, no other 64-bit powerpc machines. Because nvidiafb still breaks suspend I have marked it EXPERIMENTAL on powermac and because I can't test it and some lowlevel code will need changes it is BROKEN on all other 64-bit platforms. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/swsusp.c')
-rw-r--r--arch/powerpc/kernel/swsusp.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index b89e4f5a0b08..064a7ba4f02c 100644
--- a/arch/powerpc/kernel/swsusp.c
+++ b/arch/powerpc/kernel/swsusp.c
@@ -24,6 +24,11 @@ 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)
@@ -31,4 +36,8 @@ 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();
+#endif
}
OpenPOWER on IntegriCloud