summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorShawn Anastasio <shawn@anastas.io>2020-08-21 21:55:56 +0300
committerMichael Ellerman <mpe@ellerman.id.au>2020-08-24 07:12:53 +0300
commit12564485ed8caac3c18572793ec01330792c7191 (patch)
tree4c39433df7192a8b16f72299def2b1bc6c634fb4 /mm
parent64ef8f2c4791940d7f3945507b6a45c20d959260 (diff)
downloadlinux-12564485ed8caac3c18572793ec01330792c7191.tar.xz
Revert "powerpc/64s: Remove PROT_SAO support"
This reverts commit 5c9fa16e8abd342ce04dc830c1ebb2a03abf6c05. Since PROT_SAO can still be useful for certain classes of software, reintroduce it. Concerns about guest migration for LPARs using SAO will be addressed next. Signed-off-by: Shawn Anastasio <shawn@anastas.io> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200821185558.35561-2-shawn@anastas.io
Diffstat (limited to 'mm')
-rw-r--r--mm/ksm.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/ksm.c b/mm/ksm.c
index 0aa2247bddd7..90a625b02a1d 100644
--- a/mm/ksm.c
+++ b/mm/ksm.c
@@ -2453,6 +2453,10 @@ int ksm_madvise(struct vm_area_struct *vma, unsigned long start,
if (vma_is_dax(vma))
return 0;
+#ifdef VM_SAO
+ if (*vm_flags & VM_SAO)
+ return 0;
+#endif
#ifdef VM_SPARC_ADI
if (*vm_flags & VM_SPARC_ADI)
return 0;