From 786cfa697f385720fcc811001ec80e866e00226a Mon Sep 17 00:00:00 2001 From: Chris Metcalf Date: Thu, 29 Mar 2012 15:40:50 -0400 Subject: [PATCH] --- yaml --- r: 298842 b: refs/heads/master c: b230ff2d5c53bb79e1121554cd3c827e5c1b70fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/tile/mm/fault.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 0b40f5da9145..a40a5cbbf634 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 12400f1f22ad7651efa1d3d06dd8b6b178d19ea3 +refs/heads/master: b230ff2d5c53bb79e1121554cd3c827e5c1b70fd diff --git a/trunk/arch/tile/mm/fault.c b/trunk/arch/tile/mm/fault.c index a1da473c8555..22e58f51ed23 100644 --- a/trunk/arch/tile/mm/fault.c +++ b/trunk/arch/tile/mm/fault.c @@ -342,9 +342,12 @@ static int handle_page_fault(struct pt_regs *regs, /* * If we're trying to touch user-space addresses, we must * be either at PL0, or else with interrupts enabled in the - * kernel, so either way we can re-enable interrupts here. + * kernel, so either way we can re-enable interrupts here + * unless we are doing atomic access to user space with + * interrupts disabled. */ - local_irq_enable(); + if (!(regs->flags & PT_FLAGS_DISABLE_IRQ)) + local_irq_enable(); mm = tsk->mm;