From patchwork Tue Jun 9 11:22:18 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Eisele X-Patchwork-Id: 28304 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id F0F54B70C6 for ; Tue, 9 Jun 2009 21:19:44 +1000 (EST) Received: by ozlabs.org (Postfix) id E346EDDD0B; Tue, 9 Jun 2009 21:19:44 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 82136DDD01 for ; Tue, 9 Jun 2009 21:19:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754628AbZFILTW (ORCPT ); Tue, 9 Jun 2009 07:19:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754776AbZFILTW (ORCPT ); Tue, 9 Jun 2009 07:19:22 -0400 Received: from mail168c2.megamailservers.com ([69.49.111.68]:43507 "EHLO mail168c2.megamailservers.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754628AbZFILTV (ORCPT ); Tue, 9 Jun 2009 07:19:21 -0400 X-Authenticated-User: konrad.gaisler.com Received: from [192.168.0.29] (c-10a5e155.260-1-64736c10.cust.bredbandsbolaget.se [85.225.165.16]) (authenticated bits=0) by mail168c2.megamailservers.com (8.13.6/8.13.1) with ESMTP id n59BJLCT020484 for ; Tue, 9 Jun 2009 07:19:23 -0400 Message-ID: <4A2E45EA.5040705@gaisler.com> Date: Tue, 09 Jun 2009 13:22:18 +0200 From: Konrad Eisele User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.17) Gecko/20080829 SeaMonkey/1.1.12 MIME-Version: 1.0 To: sparclinux@vger.kernel.org Subject: [PATCH 6/7] Handle sparc-leon SRMMU specific bug References: <4A2E36A6.4050008@gaisler.com> In-Reply-To: <4A2E36A6.4050008@gaisler.com> Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org From f95779d3a4d478d9df1070cc54a42163993f3b97 Mon Sep 17 00:00:00 2001 From: Konrad Eisele Date: Tue, 9 Jun 2009 13:05:17 +0200 Subject: [PATCH 6/7] Handle sparc-leon SRMMU specific bug. Shielded by CONFIG_LEON. Signed-off-by: Konrad Eisele --- arch/sparc/mm/fault_32.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c index 12e447f..602eb82 100644 --- a/arch/sparc/mm/fault_32.c +++ b/arch/sparc/mm/fault_32.c @@ -227,7 +227,11 @@ asmlinkage void do_sparc_fault(struct pt */ good_area: info.si_code = SEGV_ACCERR; - if(write) { + if (write +#ifdef CONFIG_LEON + && !text_fault +#endif + ) { if(!(vma->vm_flags & VM_WRITE)) goto bad_area; } else {