summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/swsusp.c
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2007-05-10 22:22:45 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-11 08:29:34 -0700
commite1fa2e136ff64a3814a98c03d46320b9e80d29c8 (patch)
tree14620d6f3361274139cccded4b38dc7e0347a593 /arch/powerpc/kernel/swsusp.c
parent2acdb1694494eb6f17b44b2b3065879af32d0d46 (diff)
downloadlinux-e1fa2e136ff64a3814a98c03d46320b9e80d29c8.tar.gz
linux-e1fa2e136ff64a3814a98c03d46320b9e80d29c8.tar.bz2
linux-e1fa2e136ff64a3814a98c03d46320b9e80d29c8.zip
powerpc: fixup hard_irq_disable semantics
This patch renames the raw hard_irq_{enable,disable} into __hard_irq_{enable,disable} and introduces a higher level hard_irq_disable() function that can be used by any code to enforce that IRQs are fully disabled, not only lazy disabled. The difference with the __ versions is that it will update some per-processor fields so that the kernel keeps track and properly re-enables them in the next local_irq_disable(); This prepares powerpc for my next patch that introduces hard_irq_disable() generically. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Paul Mackerras <paulus@samba.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/powerpc/kernel/swsusp.c')
-rw-r--r--arch/powerpc/kernel/swsusp.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/swsusp.c b/arch/powerpc/kernel/swsusp.c
index 064a7ba4f02c..77b7b34b5955 100644
--- a/arch/powerpc/kernel/swsusp.c
+++ b/arch/powerpc/kernel/swsusp.c
@@ -36,8 +36,4 @@ 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
}