diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-14 22:57:18 +1000 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2020-09-14 22:57:18 +1000 |
commit | 960e3708135ac8b03ef3d1fa773e369cfacc76b9 (patch) | |
tree | 3b3b679d211377a291a55fb9598d1c7f408aeab9 /arch/powerpc/include/uapi/asm/mman.h | |
parent | dc462267d2d7aacffc3c1d99b02d7a7c59db7c66 (diff) | |
parent | 0460534b532e5518c657c7d6492b9337d975eaa3 (diff) |
Merge branch 'fixes' into next
Bring in our fixes branch for this cycle which avoids some small
conflicts with upcoming commits.
Diffstat (limited to 'arch/powerpc/include/uapi/asm/mman.h')
-rw-r--r-- | arch/powerpc/include/uapi/asm/mman.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/uapi/asm/mman.h b/arch/powerpc/include/uapi/asm/mman.h index 3a700351feca..c0c737215b00 100644 --- a/arch/powerpc/include/uapi/asm/mman.h +++ b/arch/powerpc/include/uapi/asm/mman.h @@ -11,7 +11,7 @@ #include <asm-generic/mman-common.h> -#define PROT_SAO 0x10 /* Unsupported since v5.9 */ +#define PROT_SAO 0x10 /* Strong Access Ordering */ #define MAP_RENAME MAP_ANONYMOUS /* In SunOS terminology */ #define MAP_NORESERVE 0x40 /* don't reserve swap pages */ |