Received: by 10.192.165.148 with SMTP id m20csp1178591imm; Thu, 10 May 2018 06:55:03 -0700 (PDT) X-Google-Smtp-Source: AB8JxZo014XslV853cPFySJqR+0caZupQehY+roPGN5fJTWpWO9bkMTW6yzHVW0W4hLjNQp+nSBL X-Received: by 2002:a17:902:8a87:: with SMTP id p7-v6mr1480997plo.278.1525960503028; Thu, 10 May 2018 06:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525960502; cv=none; d=google.com; s=arc-20160816; b=fsxCpQDVdQTzL9JDgJomoGi5iV5HGwsQLo1Rz2hW8twurQWK29ZpX7dPaIL3AwkNB2 dGxKUDQ//x+p8w2WOg8K0lb0FRh7WDpo7bxz+PrBEYcrvD2SeB5FEcncHOa0od3IkQ5c Fdz/TbOOTHvUv6aMHtlwpmanbXj/igU4xWQAuHxW5TAk5LMxatJ99wYWjqIb1sYlDF8m AD2kNOeo18GqTX1xPAm7sLJGFyMGu9eYsrpXY0F9HUGujXJr7RVlXFMzeHma5SFIvXUg PSukJbB5fK12G6U8TK9LibXiIOTOcFvOstX8aGtKIH3pz/6bZP3PWuZcp4ohBFO/aa6t Jg+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=WHFzZB9DFEfb2mazVIv/7eXFU/3+0bw+oYakzn+SSWU=; b=HblpYj4wuBH54QYLVs8tTkzI25A1v9OnQIHVjlwsonxRpKkf227whJagr98gnlNe87 omLcpbxOHw8ZBg3c+YZyHelNUgS2woL9pcrEyA+V/1cRMTKnqd5/c5lR1e5l1J9UzUfa fZBodeo6rjWmF24fSkbrW0r2az7cfBJ2RwocuAf0/CX2pvJw9Fo+iH0Gb0FtqOwKAt9G 4AFFbSiLGFMCrCXK2I6kI1t3C03KxS4cpNSfmufEqNOhE7bRZCbR06LbcSkmU1ZqjY/S JpHvwXfdKPIkrdlB7zLU5QpfO28cJByWCMCSdehkZ5uxbiV/Vr7SEJ2u8h5lcpQXRl4S qCfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f7-v6si830046pfa.78.2018.05.10.06.54.47; Thu, 10 May 2018 06:55:02 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757377AbeEJNyb (ORCPT + 99 others); Thu, 10 May 2018 09:54:31 -0400 Received: from ozlabs.org ([203.11.71.1]:36933 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751632AbeEJNya (ORCPT ); Thu, 10 May 2018 09:54:30 -0400 Received: by ozlabs.org (Postfix, from userid 1034) id 40hZTd0XlBz9s0x; Thu, 10 May 2018 23:54:28 +1000 (AEST) From: Michael Ellerman To: linuxram@us.ibm.com Cc: mingo@redhat.com, linuxppc-dev@ozlabs.org, linux-mm@kvack.org, x86@kernel.org, linux-kernel@vger.kernel.org, dave.hansen@intel.com Subject: [PATCH 9/8] powerpc/pkeys: Drop private VM_PKEY definitions Date: Thu, 10 May 2018 23:54:22 +1000 Message-Id: <20180510135422.6585-1-mpe@ellerman.id.au> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180508145948.9492-9-mpe@ellerman.id.au> References: <20180508145948.9492-9-mpe@ellerman.id.au> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Now that we've updated the generic headers to support 5 PKEY bits for powerpc we don't need our own #defines in arch code. Signed-off-by: Michael Ellerman --- arch/powerpc/include/asm/pkeys.h | 15 --------------- 1 file changed, 15 deletions(-) One additional patch to finish cleaning things up. I've added this to my branch. cheers diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h index 18ef59a9886d..5ba80cffb505 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -15,21 +15,6 @@ DECLARE_STATIC_KEY_TRUE(pkey_disabled); extern int pkeys_total; /* total pkeys as per device tree */ extern u32 initial_allocation_mask; /* bits set for reserved keys */ -/* - * Define these here temporarily so we're not dependent on patching linux/mm.h. - * Once it's updated we can drop these. - */ -#ifndef VM_PKEY_BIT0 -# define VM_PKEY_SHIFT VM_HIGH_ARCH_BIT_0 -# define VM_PKEY_BIT0 VM_HIGH_ARCH_0 -# define VM_PKEY_BIT1 VM_HIGH_ARCH_1 -# define VM_PKEY_BIT2 VM_HIGH_ARCH_2 -# define VM_PKEY_BIT3 VM_HIGH_ARCH_3 -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 -#elif !defined(VM_PKEY_BIT4) -# define VM_PKEY_BIT4 VM_HIGH_ARCH_4 -#endif - #define ARCH_VM_PKEY_FLAGS (VM_PKEY_BIT0 | VM_PKEY_BIT1 | VM_PKEY_BIT2 | \ VM_PKEY_BIT3 | VM_PKEY_BIT4) -- 2.14.1