summaryrefslogtreecommitdiffstats
path: root/linux-headers/asm-powerpc/mman.h
diff options
context:
space:
mode:
authorEric Auger2019-10-03 17:46:38 +0200
committerPeter Maydell2019-10-15 19:09:02 +0200
commitf363d039e883ce6eb2a4fd09b04a38cbb6c95d43 (patch)
tree30c86533b083bee2006ebdd3fc95aefe9ef900ed /linux-headers/asm-powerpc/mman.h
parentMerge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging (diff)
downloadqemu-f363d039e883ce6eb2a4fd09b04a38cbb6c95d43.tar.gz
qemu-f363d039e883ce6eb2a4fd09b04a38cbb6c95d43.tar.xz
qemu-f363d039e883ce6eb2a4fd09b04a38cbb6c95d43.zip
linux headers: update against v5.4-rc1
Update the headers against commit: 0f1a7b3fac05 ("timer-of: don't use conditional expression with mixed 'void' types") Signed-off-by: Eric Auger <eric.auger@redhat.com> Acked-by: Marc Zyngier <maz@kernel.org> Message-id: 20191003154640.22451-2-eric.auger@redhat.com Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-headers/asm-powerpc/mman.h')
-rw-r--r--linux-headers/asm-powerpc/mman.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/linux-headers/asm-powerpc/mman.h b/linux-headers/asm-powerpc/mman.h
index 1c2b3fca05..8db7c2a3be 100644
--- a/linux-headers/asm-powerpc/mman.h
+++ b/linux-headers/asm-powerpc/mman.h
@@ -21,15 +21,11 @@
#define MAP_DENYWRITE 0x0800 /* ETXTBSY */
#define MAP_EXECUTABLE 0x1000 /* mark it as an executable */
+
#define MCL_CURRENT 0x2000 /* lock all currently mapped pages */
#define MCL_FUTURE 0x4000 /* lock all additions to address space */
#define MCL_ONFAULT 0x8000 /* lock all pages that are faulted in */
-#define MAP_POPULATE 0x8000 /* populate (prefault) pagetables */
-#define MAP_NONBLOCK 0x10000 /* do not block on IO */
-#define MAP_STACK 0x20000 /* give out an address that is best suited for process/thread stacks */
-#define MAP_HUGETLB 0x40000 /* create a huge page mapping */
-
/* Override any generic PKEY permission defines */
#define PKEY_DISABLE_EXECUTE 0x4
#undef PKEY_ACCESS_MASK