From patchwork Thu Feb 6 14:16:11 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Capper X-Patchwork-Id: 24257 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E58BA20143 for ; Thu, 6 Feb 2014 14:17:11 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id m1sf9883255oag.1 for ; Thu, 06 Feb 2014 06:17:11 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:content-type:content-transfer-encoding; bh=LeEOUTHI+s/RhrglHjHVinn6NHqY4RqC2WViXTLq9dc=; b=UyKt2wWnWJnenJIl9Xl/7UH9OGZ85FjmAgRVguVoBvyh/qHC8Nvwsv26eEixOIoSQu QT117T29xfyidMZwGpLg/rVqvSWzB3P+fiqP9JbvdtmQ5Cmh7oYSBNm4zFluko6oklXy 0G+4iPb5HtlBkyf0gyh5IDIPlMgWXOf6T5Gk6KQEQhFfyM6ZseLRR1uZ5etHcM8us2n2 mJQw0Y9utN/I7JDD7iXr3RF5oDdabON0lWOHNWG5boc8RTv22ultMU107xjqCw3abNJt JUfXR084YWkM7XYOCFBQ+0t6WTIYPk5USTH5opFfGisni2EjXrWdLMAL8WAR0g0oq1gX vNnQ== X-Gm-Message-State: ALoCoQkdxZlo8F/G+CXYzNYA9e7MvVjc7kjoOij5hoFwNjfx+V751Z7AWdg4AazWaS6NhUz8dCWP X-Received: by 10.42.78.197 with SMTP id o5mr3218178ick.9.1391696230999; Thu, 06 Feb 2014 06:17:10 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.38 with SMTP id n35ls623903qga.68.gmail; Thu, 06 Feb 2014 06:17:10 -0800 (PST) X-Received: by 10.52.104.68 with SMTP id gc4mr4966726vdb.2.1391696230790; Thu, 06 Feb 2014 06:17:10 -0800 (PST) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id kl10si277704vdb.90.2014.02.06.06.17.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 06 Feb 2014 06:17:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id le5so1462561vcb.16 for ; Thu, 06 Feb 2014 06:17:10 -0800 (PST) X-Received: by 10.52.155.66 with SMTP id vu2mr187822vdb.50.1391696230448; Thu, 06 Feb 2014 06:17:10 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.174.196 with SMTP id u4csp16112vcz; Thu, 6 Feb 2014 06:17:09 -0800 (PST) X-Received: by 10.194.186.204 with SMTP id fm12mr6126725wjc.27.1391696229385; Thu, 06 Feb 2014 06:17:09 -0800 (PST) Received: from casper.infradead.org (casper.infradead.org. [2001:770:15f::2]) by mx.google.com with ESMTPS id lp8si11453665wic.73.2014.02.06.06.17.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2014 06:17:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:770:15f::2 as permitted sender) client-ip=2001:770:15f::2; Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBPlA-0008HE-5x; Thu, 06 Feb 2014 14:16:56 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBPl7-0008VQ-Qg; Thu, 06 Feb 2014 14:16:53 +0000 Received: from mail-wg0-f52.google.com ([74.125.82.52]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WBPl5-0008UL-MN for linux-arm-kernel@lists.infradead.org; Thu, 06 Feb 2014 14:16:52 +0000 Received: by mail-wg0-f52.google.com with SMTP id b13so1299375wgh.31 for ; Thu, 06 Feb 2014 06:16:25 -0800 (PST) X-Received: by 10.194.185.237 with SMTP id ff13mr1683666wjc.64.1391696185262; Thu, 06 Feb 2014 06:16:25 -0800 (PST) Received: from marmot.wormnet.eu (marmot.wormnet.eu. [188.246.204.87]) by mx.google.com with ESMTPSA id ci4sm2719045wjc.21.2014.02.06.06.16.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 06 Feb 2014 06:16:24 -0800 (PST) From: Steve Capper To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] arm64: mm: Correct definition of pmd_mknotpresent Date: Thu, 6 Feb 2014 14:16:11 +0000 Message-Id: <1391696171-8922-4-git-send-email-steve.capper@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1391696171-8922-1-git-send-email-steve.capper@linaro.org> References: <1391696171-8922-1-git-send-email-steve.capper@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140206_091651_836642_B142DBC2 X-CRM114-Status: UNSURE ( 8.69 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.52 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: catalin.marinas@arm.com, will.deacon@arm.com, Steve Capper , linux@arm.linux.org.uk 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+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: steve.capper@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 pmd_mknotpresent currently creates a faulting pmd by clearing the valid bit. Unfortunately pmd_present(.) will report such pmds as being present! This patch re-defines pmd_mknotpresent such that __pmd(0) is returned instead. Signed-off-by: Steve Capper --- arch/arm64/include/asm/pgtable.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/pgtable.h b/arch/arm64/include/asm/pgtable.h index a5d5832..5d266e4 100644 --- a/arch/arm64/include/asm/pgtable.h +++ b/arch/arm64/include/asm/pgtable.h @@ -291,8 +291,7 @@ static inline pmd_t pmd_mkyoung(pmd_t pmd) static inline pmd_t pmd_mknotpresent(pmd_t pmd) { - pmd_val(pmd) &= ~PMD_TYPE_MASK; - return pmd; + return __pmd(0); } #define pmd_mkhuge(pmd) (__pmd(pmd_val(pmd) & ~PMD_TABLE_BIT))