From: Ram Pai <linuxram@us.ibm.com>
To: mpe@ellerman.id.au, linuxppc-dev@lists.ozlabs.org
Cc: benh@kernel.crashing.org, paulus@samba.org,
khandual@linux.vnet.ibm.com, aneesh.kumar@linux.vnet.ibm.com,
bsingharora@gmail.com, hbabu@us.ibm.com, mhocko@kernel.org,
bauerman@linux.vnet.ibm.com, ebiederm@xmission.com,
linuxram@us.ibm.com
Subject: [PATCH] powerpc/memkey: fix compilation error caused by upstream changes
Date: Mon, 9 Oct 2017 11:11:46 -0500 [thread overview]
Message-ID: <1507565506-17040-1-git-send-email-linuxram@us.ibm.com> (raw)
"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 <linuxram@us.ibm.com>
---
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
--
1.7.1
next reply other threads:[~2017-10-09 16:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 16:11 Ram Pai [this message]
2017-10-10 9:00 ` [PATCH] powerpc/memkey: fix compilation error caused by upstream changes Michael Ellerman
2017-10-10 16:19 ` Ram Pai
2017-10-10 16:22 ` [PATCH] powerpc/memkey: feature applies to PPC_BOOK3S_64 archs only Ram Pai
2017-10-11 10:50 ` Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1507565506-17040-1-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=aneesh.kumar@linux.vnet.ibm.com \
--cc=bauerman@linux.vnet.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bsingharora@gmail.com \
--cc=ebiederm@xmission.com \
--cc=hbabu@us.ibm.com \
--cc=khandual@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mhocko@kernel.org \
--cc=mpe@ellerman.id.au \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).