From patchwork Tue Jun 21 09:15:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Russell King - ARM Linux X-Patchwork-Id: 900572 X-Patchwork-Delegate: tony@atomide.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5L9FqCi028790 for ; Tue, 21 Jun 2011 09:15:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751800Ab1FUJPt (ORCPT ); Tue, 21 Jun 2011 05:15:49 -0400 Received: from caramon.arm.linux.org.uk ([78.32.30.218]:34151 "EHLO caramon.arm.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751276Ab1FUJPt (ORCPT ); Tue, 21 Jun 2011 05:15:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=arm.linux.org.uk; s=caramon; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=x8dq8QG11Z2hXOGdYut4VFXVBohNZ1N415uG9728CGs=; b=KXEtMNzTprHalHvNwdwL/Ctjpu7FmTJ8fa7/YHhaNn7XP3QXkAwCglpzRdnW8A8tl6bDhvgkHv4+s3T/wSZ+kfsy6Kn5JtkCP3nceyAr9nWQYc3h2HhS4zDJgbTSKmHruUJC0VH4X/Rb8SHwmnQXDbhZZ4OeXQx7qaDMhs1f1o0=; Received: from n2100.arm.linux.org.uk ([2002:4e20:1eda:1:214:fdff:fe10:4f86]) by caramon.arm.linux.org.uk with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.72) (envelope-from ) id 1QYx3T-00026f-Jw; Tue, 21 Jun 2011 10:15:32 +0100 Received: from linux by n2100.arm.linux.org.uk with local (Exim 4.72) (envelope-from ) id 1QYx3S-00061r-A5; Tue, 21 Jun 2011 10:15:30 +0100 Date: Tue, 21 Jun 2011 10:15:29 +0100 From: Russell King - ARM Linux To: TAO HU Cc: linux-arm-kernel@lists.infradead.org, linux-omap , Zhou Ming-a17711 Subject: Re: Bug in _und_usr on dual-core ARM? Message-ID: <20110621091529.GA22868@n2100.arm.linux.org.uk> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Tue, 21 Jun 2011 09:15:52 +0000 (UTC) On Tue, Jun 21, 2011 at 04:31:19PM +0800, TAO HU wrote: > Hi, All > > We got an issue on our OMAP4 SMP system. > Looks like __und_user(), which was triggered by a user space > exception, got a page fault hence lead to might_sleep() failure. Could you see whether this patch prevents the warning please. --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index bc0e1d8..d52b940 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c @@ -289,7 +289,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) * If we're in an interrupt or have no user * context, we must not take the fault.. */ - if (in_atomic() || !mm) + if (in_atomic() || irqs_disabled() || !mm) goto no_context; /*