summaryrefslogtreecommitdiffstats
path: root/block/blk-merge.c
diff options
context:
space:
mode:
authorTiejun Chen <tiejun.chen@windriver.com>2013-01-06 00:49:34 +0000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2013-01-29 10:18:15 +1100
commit572177d7c77db1981ba2563e01478126482c43bc (patch)
tree89a68e8ee9014606031f98f0222f037eb7510aa1 /block/blk-merge.c
parent46ed7a76ae7770cb8ba733ee2b06273397ad8b5b (diff)
downloadlinux-572177d7c77db1981ba2563e01478126482c43bc.tar.bz2
powerpc/book3e: Disable interrupt after preempt_schedule_irq
In preempt case current arch_local_irq_restore() from preempt_schedule_irq() may enable hard interrupt but we really should disable interrupts when we return from the interrupt, and so that we don't get interrupted after loading SRR0/1. Signed-off-by: Tiejun Chen <tiejun.chen@windriver.com> CC: <stable@vger.kernel.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'block/blk-merge.c')
0 files changed, 0 insertions, 0 deletions