summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel
diff options
context:
space:
mode:
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-01 18:47:17 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2012-07-11 14:18:33 +1000
commit8bf8385b9c3b7f6aaf892eb3141a5af0bbb2027e (patch)
treeaa61ca4de2469e3f06db45bac652bbc374fa625a /arch/powerpc/kernel
parent9778b696a0188ad3b3524b383953ee73b31b7b68 (diff)
downloadblackbird-op-linux-8bf8385b9c3b7f6aaf892eb3141a5af0bbb2027e.tar.gz
blackbird-op-linux-8bf8385b9c3b7f6aaf892eb3141a5af0bbb2027e.zip
powerpc: Fixup oddity in entry_32.S
When I "fixed" the CONFIG_TRACE_IRQFLAGS case on interrupt entry, I screwed up a little bit with the test for user space vs. kernel. The code is fine, there's just some dead code around it. I basically removed the test and always create the added stack frame whether coming from user or kernel since in any case we do need to save a bunch of volatile registers or bad things would happen (we can take page faults in the kernel for example). Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/kernel')
-rw-r--r--arch/powerpc/kernel/entry_32.S6
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
index bad42e3d27a9..5207d5a405e2 100644
--- a/arch/powerpc/kernel/entry_32.S
+++ b/arch/powerpc/kernel/entry_32.S
@@ -226,13 +226,7 @@ reenable_mmu: /* re-enable mmu so we can */
stw r3,16(r1)
stw r4,20(r1)
stw r5,24(r1)
- andi. r12,r12,MSR_PR
- b 11f
bl trace_hardirqs_off
- b 12f
-11:
- bl trace_hardirqs_off
-12:
lwz r5,24(r1)
lwz r4,20(r1)
lwz r3,16(r1)
OpenPOWER on IntegriCloud