[<prev] [next>] [day] [month] [year] [list]
Message-Id: <201203302105.q2UL55GH006291@farm-0012.internal.tilera.com>
Date: Thu, 29 Mar 2012 15:40:50 -0400
From: Chris Metcalf <cmetcalf@...era.com>
To: Chris Metcalf <cmetcalf@...era.com>,
"Paul E. McKenney" <paul.mckenney@...aro.org>,
Lucas De Marchi <lucas.demarchi@...fusion.mobi>,
Josh Triplett <josh@...htriplett.org>,
linux-kernel@...r.kernel.org
Subject: [PATCH] arch/tile: don't enable irqs unconditionally in page fault handler
If we took a page fault while we had interrupts disabled, we
shouldn't enable them in the page fault handler.
Signed-off-by: Chris Metcalf <cmetcalf@...era.com>
---
arch/tile/mm/fault.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index bcba159..5d10a74 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -343,9 +343,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;
--
1.6.5.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists