From patchwork Thu May 10 13:54:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Ellerman X-Patchwork-Id: 10391831 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 3B4C26028E for ; Thu, 10 May 2018 13:54:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2DC5728B30 for ; Thu, 10 May 2018 13:54:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2286128B3B; Thu, 10 May 2018 13:54:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=unavailable version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C043C28B30 for ; Thu, 10 May 2018 13:54:35 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6D7026B060D; Thu, 10 May 2018 09:54:34 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 6362B6B060F; Thu, 10 May 2018 09:54:34 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 525A56B0610; Thu, 10 May 2018 09:54:34 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf0-f200.google.com (mail-pf0-f200.google.com [209.85.192.200]) by kanga.kvack.org (Postfix) with ESMTP id 1BBCA6B060D for ; Thu, 10 May 2018 09:54:34 -0400 (EDT) Received: by mail-pf0-f200.google.com with SMTP id b25-v6so1185791pfn.10 for ; Thu, 10 May 2018 06:54:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:from:to:cc :subject:date:message-id:in-reply-to:references; bh=WHFzZB9DFEfb2mazVIv/7eXFU/3+0bw+oYakzn+SSWU=; b=WVGvYWH1LTqlNESfFhEGlUVztnWoUhh+MqXQjusORsegYa2YwHCeS/AcPzC335Gx/w 6jvEiqhB/oMU0fQqfvku5u97PDLr8f5Qyp3bPFhIQePR7YapFYM469/T4EMUmrisguF9 Bs4b+NjjTI585Bke2h1lFz4zzZAJV9uL3jVYFho9rm6w5cTK2IYbirmCDFX/I7WOORsa 6yrLEvD+8sKnwzqj1vwq38Jc4iwoaFzuK8feOO+n1VCqwFodl2kKA5ZNPzl/cpmPFBw8 aux52REZ7NpG//IlQFG1MVAY10mCvebSkar9v8o+ALqfsR/vOmCg3IJ48NCxdcK7LDcm sRLQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of michael@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) smtp.mailfrom=michael@ozlabs.org X-Gm-Message-State: ALKqPwdj/nbTDORer5VHMP3vr/BnSReDdjwe0SHBGIlVx79qxoPWhTlT DqyE98U88Q0nRkNZNX1SKDKFlsf0S4dN5p8sziOjg4nmYqhbWvTKCc0HCd2y7XUdk2Clg21DETb N4Ye0gkglWumhQclHoQr5pd0p51Sf9IBbQ2NYvx4k60f3PzHGTFHC5mE4UdBVoMw= X-Received: by 2002:a62:e801:: with SMTP id c1-v6mr1506677pfi.184.1525960473693; Thu, 10 May 2018 06:54:33 -0700 (PDT) X-Google-Smtp-Source: AB8JxZpmvghe0e+r0fC68sSdNvBywDFxS0JV2QJT4SHyyskHaIOTyx2mNmUq+p19mvYOdyjsWZTn X-Received: by 2002:a62:e801:: with SMTP id c1-v6mr1506639pfi.184.1525960472970; Thu, 10 May 2018 06:54:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525960472; cv=none; d=google.com; s=arc-20160816; b=kqhBW8ThEKQHk8KDzKr9Lagg+bXMl+hhWEcNBTrwB40ZUmztL7nqt/ocQzeDm3WhUD XVY39cOhIa9VILDX6wOwAGk3yAswSBQ7bllb2Pb9+j3vcUMwd+EtRNq3jNg1TJbgHNeF R6eapPhIR1T0uOuAbKOov9Jjw7mLamIUEVLtWwqfU3kFaT98yfvuDlhjX0OZdpjD3/wc MgroCI6jV11fRJFAEHmljJhnBUE7/qOD2muL6fTeSbiTqyfyIDN0/EYQK4dqDy//B6KU LfvAIb3q/y8z9zpl2hAA1fbjf80ARzgLrrkziVE61wHVlq1QoB/wc91jC96bfGLA7L2Z y33w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=WHFzZB9DFEfb2mazVIv/7eXFU/3+0bw+oYakzn+SSWU=; b=l4UKbKyYQnv5E0xNTWQzwx3SHGe2T1RZqia0DJx+LhIhyIn0YVGk7eIo0BaLQK0hd1 qAhyiqW0r64U+YQfFJ28WQ8I8/bT5Ag6LhX9c8VOklRX10fpExmc3sxxeYM7M0x9WrOJ 500NVjnVx1pLc2q36XnKamO44byZKNBLBrx1qgYBECQNieW5FK2iPGjD/UpNT8IJI5K3 WIfgEQog44p6GvAxro2acGWU4L1Jo8zMvb/+BAniMiHRC8g/HKy7g7nfMfu8symO93Fh hdaUhyGhsPrmNvzYbkomvdDR9H+pgB1OrM22G4eKz5I+5DkqvGbS3pQVKV7zaV49EnSU yEQg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of michael@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) smtp.mailfrom=michael@ozlabs.org Received: from ozlabs.org (ozlabs.org. [2401:3900:2:1::2]) by mx.google.com with ESMTPS id r15-v6si741218pgs.292.2018.05.10.06.54.32 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 May 2018 06:54:32 -0700 (PDT) Received-SPF: pass (google.com: domain of michael@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) client-ip=2401:3900:2:1::2; Authentication-Results: mx.google.com; spf=pass (google.com: domain of michael@ozlabs.org designates 2401:3900:2:1::2 as permitted sender) smtp.mailfrom=michael@ozlabs.org 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> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000003, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP 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 Reviewed-by: Ram Pai --- 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)