From patchwork Tue Apr 23 02:17:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoffer Dall X-Patchwork-Id: 2475181 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 4B187DF23A for ; Tue, 23 Apr 2013 02:17:12 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUSn3-00076Q-0c; Tue, 23 Apr 2013 02:17:05 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUSn0-0005re-Fd; Tue, 23 Apr 2013 02:17:02 +0000 Received: from mail-pd0-f179.google.com ([209.85.192.179]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UUSmw-0005rM-SG for linux-arm-kernel@lists.infradead.org; Tue, 23 Apr 2013 02:16:59 +0000 Received: by mail-pd0-f179.google.com with SMTP id x11so94308pdj.10 for ; Mon, 22 Apr 2013 19:16:57 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=CL0qHO/LT5t08LS+lPv33h5xE6NpBI8XNh+1yzDS1MQ=; b=SWqSdcxH/XsEYVMICForM78+JigONnQ+QJuM0odyrMcMP4rBGlEi+bF2vB8wT9NXwW uby3o1Xq1inm1IhJyeBaDodYBbv4KvLQPKoVf00TAOnvNMbKCvg5MDmFcoQ/GzgF2EdK sgCL5P6g5wBVG/MCr6oCtpmYklXGfRL4byxLCXwHunECeoLh+j2pwWXqQqGS4RWLXRxD 3pDs3MAvZdoD4Twg3w+G67pm+rKDLBFskIVYEd9K2pgNynGJ4AwrGqjs5v9LNa+f+FKS 0ZHpyXKyJsuLWbjy8lewVfvj0m77rrLCZCIuVnTmn0MADH5semA9cMq+scGhldNx8C9g 9uWw== X-Received: by 10.68.185.162 with SMTP id fd2mr35843450pbc.176.1366683416907; Mon, 22 Apr 2013 19:16:56 -0700 (PDT) Received: from chazy.8.8.4.4 (c-174-62-74-11.hsd1.ca.comcast.net. [174.62.74.11]) by mx.google.com with ESMTPS id ra9sm29505194pab.16.2013.04.22.19.16.56 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 22 Apr 2013 19:16:56 -0700 (PDT) From: Christoffer Dall To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: mm: Get rid of L_PTE_USER ref from PAGE_S2_DEVICE Date: Mon, 22 Apr 2013 19:17:10 -0700 Message-Id: <1366683430-24328-1-git-send-email-cdall@cs.columbia.edu> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQnFamWnXFaYP7lgt9w8jDfLC4VlsyNhD5rh3XKzRF9BOyb11NRzXQtTrz/uXxGiseIWc+NG X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130422_221659_009286_4C8241DD X-CRM114-Status: UNSURE ( 8.23 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [209.85.192.179 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Christoffer Dall , kvmarm@lists.cs.columbia.edu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org THe L_PTE_USER actually has nothing to do with stage 2 mappings and the L_PTE_S2_RDONLY value sets the readable bit, which was what L_PTE_USER was used for before proper handling of stage 2 memory defines. Signed-off-by: Christoffer Dall --- arch/arm/include/asm/pgtable.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index 80d6fc4..1d1f97f 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -88,7 +88,7 @@ extern pgprot_t pgprot_s2_device; #define PAGE_HYP _MOD_PROT(pgprot_kernel, L_PTE_HYP) #define PAGE_HYP_DEVICE _MOD_PROT(pgprot_hyp_device, L_PTE_HYP) #define PAGE_S2 _MOD_PROT(pgprot_s2, L_PTE_S2_RDONLY) -#define PAGE_S2_DEVICE _MOD_PROT(pgprot_s2_device, L_PTE_USER | L_PTE_S2_RDONLY) +#define PAGE_S2_DEVICE _MOD_PROT(pgprot_s2_device, L_PTE_S2_RDONLY) #define __PAGE_NONE __pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN | L_PTE_NONE) #define __PAGE_SHARED __pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_XN)