Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp651829ybz; Wed, 15 Apr 2020 16:00:13 -0700 (PDT) X-Google-Smtp-Source: APiQypI6OmOO4wv6p2HartWxH4o3SB63o+qrHbZptgFvEEMUdBIpTCJ2W8aQtGcUzGqs7AtxZ5bz X-Received: by 2002:aa7:c4cb:: with SMTP id p11mr7914591edr.85.1586991613533; Wed, 15 Apr 2020 16:00:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586991613; cv=none; d=google.com; s=arc-20160816; b=Pw4hVXsRueOMuGsDtdY9sOTewlKnuvff3gJ1rmldTrJH9J19ZgUkRQ0Ber03ihEC/s 9P8TukQH4mdKhxKivO2eA5DxMabDeHnKa+qII2GJqJFKySx2/DfpxGAfWAAM5LcCxQSp /s8KG9RmGphf+eklg82Q+dAdZ3RaFMFdEfcwdKs6gDie6eZPg7UeosIN6GuxbbGgbF4h bOsAMpdqqLHc6Rg/b2xQRvVzWP3fdvNvWKydp8JMS+32AOChspw79jyGsivQchFr62lO YW4LRM0Cr3PBfReIeq0HmCUDNB/oYr/k8/SKO230YqsjkC1yzJ+lqbII7CKygdGgjyNi q2Dw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from; bh=su7TYVvPWWzGureVU4gNidfpouU7yY+f2go1BeCtCO4=; b=bERpWDuK6EHkn48FBa51SkgSr+5B+BJb4V2f0p5q39NI/LHVDGKYDwzeFIYocyg3oD ELilE3CZobKgELcO+mGYW45KaO0eeOIqWN3kdOj2nnT1nre77Jhf7ILXqzoowjUTSghR RPuCqYl1VHKGjzh3f6kQak3YnZjvZc5o4CkRH7qW7HS3fSUiXbcJteJhii5EU/8jJGcW glls0DvIvXhEdMdWwL0vPH3mDT4HxrOyPlUsrCghfzKYRoB/UCg97f7IAH43env+B9RY em/p/uf2Fv1v3sAMPOFPFEyLG1ARWUVVybQWziKtgSY9nLSYxnMHM7WlR4BaiDZDZnNR /B4A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y32si10916669edy.304.2020.04.15.15.59.50; Wed, 15 Apr 2020 16:00:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2896688AbgDOK6Z (ORCPT + 99 others); Wed, 15 Apr 2020 06:58:25 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:2329 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S2896684AbgDOK6S (ORCPT ); Wed, 15 Apr 2020 06:58:18 -0400 Received: from DGGEMS402-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 6A0BE3045232E8082CF7; Wed, 15 Apr 2020 18:58:06 +0800 (CST) Received: from DESKTOP-8RFUVS3.china.huawei.com (10.173.222.27) by DGGEMS402-HUB.china.huawei.com (10.3.19.202) with Microsoft SMTP Server id 14.3.487.0; Wed, 15 Apr 2020 18:58:00 +0800 From: Zenghui Yu To: , , CC: , , , , Zenghui Yu Subject: [PATCH] KVM: arm64: Drop PTE_S2_MEMATTR_MASK Date: Wed, 15 Apr 2020 18:57:46 +0800 Message-ID: <20200415105746.314-1-yuzenghui@huawei.com> X-Mailer: git-send-email 2.23.0.windows.1 MIME-Version: 1.0 Content-Transfer-Encoding: 7BIT Content-Type: text/plain; charset=US-ASCII X-Originating-IP: [10.173.222.27] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The only user of PTE_S2_MEMATTR_MASK macro had been removed since commit a501e32430d4 ("arm64: Clean up the default pgprot setting"). It has been about six years and no one has used it again. Let's drop it. Signed-off-by: Zenghui Yu --- arch/arm64/include/asm/pgtable-hwdef.h | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index 6bf5e650da78..99315bdca0e6 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -190,7 +190,6 @@ * Memory Attribute override for Stage-2 (MemAttr[3:0]) */ #define PTE_S2_MEMATTR(t) (_AT(pteval_t, (t)) << 2) -#define PTE_S2_MEMATTR_MASK (_AT(pteval_t, 0xf) << 2) /* * EL2/HYP PTE/PMD definitions -- 2.19.1