From patchwork Mon Oct 9 16:11:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ram Pai X-Patchwork-Id: 823328 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3y9ljw5rwKz9tXv for ; Tue, 10 Oct 2017 03:16:36 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gBsO4RhW"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3y9ljw2cBlzDr4w for ; Tue, 10 Oct 2017 03:16:36 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gBsO4RhW"; dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:400d:c0d::243; helo=mail-qt0-x243.google.com; envelope-from=ram.n.pai@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gBsO4RhW"; dkim-atps=neutral Received: from mail-qt0-x243.google.com (mail-qt0-x243.google.com [IPv6:2607:f8b0:400d:c0d::243]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3y9lgJ1BY5zDqv8 for ; Tue, 10 Oct 2017 03:14:19 +1100 (AEDT) Received: by mail-qt0-x243.google.com with SMTP id p1so6749791qtg.2 for ; Mon, 09 Oct 2017 09:14:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=AKkMs6uM1F7NQxL2Yi17WRbK+CFVDU8EbgGO8oGeYGs=; b=gBsO4RhWAaPfefLAGGmi5UO50wlx3xg2tR8dM4f/26G1y58JgN+3UxAb4jOIHOOzxO rfOpWlHQC6QVEtI36T58vwOtHHYZZ5o1aILkJGJcqAdiEnqwEaBQjYb3CXAy377x2VRS vdUhQuRexli7f1SelbjvESR2gXY2iAjr+e4s7LAvPAwFjVk0z3l87FJBWklGLQ7Gfw5V Vt081kU//KDWNEfUVZ83/4manHEcajCbFVbJmm+2RqGIfqbuWOPlB6ru2+hmlF8LhMl/ XEQmVaCE0Q5FpLHlAmgiLSED4Nx2FMqYtS6TNwuElvAnGjTNfRpbA8ZuuqHQFM7g+OuU eR0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=AKkMs6uM1F7NQxL2Yi17WRbK+CFVDU8EbgGO8oGeYGs=; b=kgnTaInkW4tYDRdJSKYwuWN6nPMbGGIC6V/fHhunvuFS+zR1VXi1im7h/k1megeDPo PIMIXPqod4EsmasmsE6LRTaRar2oZcd/jDm3D4eIBOeybn5TA15ePI2b/hqHoPH8aBoA Dwa3RQRCYeW/HBKfZ7RAxfx4t9lEnfq4pr+8m7zyKB50E3DS9xk1sZ2O0N7sohZpUL3T 7UFSmxmuxSxFsocAUUOUBhno9NfZd6Fzd98XzdK0azDUrGdj3AoWU9lp+0b+HyyhIjKx r/x/C1jl743ynrIafbE/QFolK9DnudpRG5Dfs9Ez9bvXl/OD/Fb/+XgYc/waZMYeFC/u UqQA== X-Gm-Message-State: AMCzsaVgjcfTqx2Tjd3Hha+N5FVUei8eBKT/ffZwqnyqSmskSrWfFHma L6reZPGJZkc3SEtAvqw0b3E= X-Google-Smtp-Source: AOwi7QCAuMtJ7oSkIL8l/f3Bk+5Q5yS8MB6DjlXuh0ATgotVp0Vac/G6OQ2/vXRaezja3Jet8mTKaQ== X-Received: by 10.237.33.67 with SMTP id 61mr15008667qtc.148.1507565657327; Mon, 09 Oct 2017 09:14:17 -0700 (PDT) Received: from localhost.localdomain ([32.97.110.56]) by smtp.gmail.com with ESMTPSA id s44sm5152298qtc.92.2017.10.09.09.14.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 Oct 2017 09:14:16 -0700 (PDT) From: Ram Pai To: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org Subject: [PATCH] powerpc/memkey: fix compilation error caused by upstream changes Date: Mon, 9 Oct 2017 11:11:46 -0500 Message-Id: <1507565506-17040-1-git-send-email-linuxram@us.ibm.com> X-Mailer: git-send-email 1.7.1 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ebiederm@xmission.com, linuxram@us.ibm.com, mhocko@kernel.org, paulus@samba.org, aneesh.kumar@linux.vnet.ibm.com, bauerman@linux.vnet.ibm.com, khandual@linux.vnet.ibm.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" "commit df3735c5 -- x86,mpx: make mpx depend on x86-64 to free up VMA flag" added the same vm highmem flag we had introduced for PKEY4. That broke some of the definitions in pkeys.h This patch fixes the issue. Signed-off-by: Ram Pai --- arch/powerpc/include/asm/pkeys.h | 4 +--- 1 files changed, 1 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/include/asm/pkeys.h b/arch/powerpc/include/asm/pkeys.h index baac435..da0d5e6 100644 --- a/arch/powerpc/include/asm/pkeys.h +++ b/arch/powerpc/include/asm/pkeys.h @@ -15,9 +15,7 @@ * we have to carry the hunk below. This is needed to get * pkeys working on power. -- Ram */ -#ifndef VM_HIGH_ARCH_BIT_4 -#define VM_HIGH_ARCH_BIT_4 36 -#define VM_HIGH_ARCH_4 BIT(VM_HIGH_ARCH_BIT_4) +#ifndef VM_PKEY_BIT4 #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