From f363d039e883ce6eb2a4fd09b04a38cbb6c95d43 Mon Sep 17 00:00:00 2001 From: Eric Auger Date: Thu, 3 Oct 2019 17:46:38 +0200 Subject: 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 Acked-by: Marc Zyngier Message-id: 20191003154640.22451-2-eric.auger@redhat.com Signed-off-by: Peter Maydell --- linux-headers/asm-generic/mman.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'linux-headers/asm-generic/mman.h') diff --git a/linux-headers/asm-generic/mman.h b/linux-headers/asm-generic/mman.h index 653687d977..57e8195d0b 100644 --- a/linux-headers/asm-generic/mman.h +++ b/linux-headers/asm-generic/mman.h @@ -9,13 +9,11 @@ #define MAP_EXECUTABLE 0x1000 /* mark it as an executable */ #define MAP_LOCKED 0x2000 /* pages are locked */ #define MAP_NORESERVE 0x4000 /* don't check for reservations */ -#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 */ -#define MAP_SYNC 0x80000 /* perform synchronous page faults for the mapping */ -/* Bits [26:31] are reserved, see mman-common.h for MAP_HUGETLB usage */ +/* + * Bits [26:31] are reserved, see asm-generic/hugetlb_encode.h + * for MAP_HUGETLB usage + */ #define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_FUTURE 2 /* lock all future mappings */ -- cgit v1.2.3-55-g7522