summaryrefslogtreecommitdiffstats
path: root/include/linux/pgtable.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2021-03-19 12:10:49 +0100
committerIngo Molnar <mingo@kernel.org>2021-03-19 12:10:49 +0100
commit01438749e36bfe53ea25c91568019be775a9782e (patch)
treef91f5abae2004863afda683589d034dcd2000ab8 /include/linux/pgtable.h
parent4faf62b1ef1a9367f7dcf8b7ce509980dfdcee83 (diff)
parentbee645788e07eea63055d261d2884ea45c2ba857 (diff)
downloadcachepc-linux-01438749e36bfe53ea25c91568019be775a9782e.tar.gz
cachepc-linux-01438749e36bfe53ea25c91568019be775a9782e.zip
Merge branch 'locking/urgent' into locking/core, to pick up dependent commits
We are applying further, lower-prio fixes on top of two ww_mutex fixes in locking/urgent. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/pgtable.h')
-rw-r--r--include/linux/pgtable.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pgtable.h b/include/linux/pgtable.h
index cdfc4e9f253e..5e772392a379 100644
--- a/include/linux/pgtable.h
+++ b/include/linux/pgtable.h
@@ -904,6 +904,10 @@ static inline void ptep_modify_prot_commit(struct vm_area_struct *vma,
#define pgprot_device pgprot_noncached
#endif
+#ifndef pgprot_mhp
+#define pgprot_mhp(prot) (prot)
+#endif
+
#ifdef CONFIG_MMU
#ifndef pgprot_modify
#define pgprot_modify pgprot_modify