| Brad Bishop | c1d3433 | 2019-09-09 14:56:00 -0400 | [diff] [blame] | 1 | From 36360b16833400de7818151be5588b16ac4fd5bc Mon Sep 17 00:00:00 2001 |
| 2 | From: Barret Rhoden <brho@google.com> |
| 3 | Date: Thu, 14 Mar 2019 17:30:38 -0400 |
| 4 | Subject: [PATCH] Fix missing include in sys/mman.h |
| 5 | |
| 6 | Linux commit 746c9398f5ac ("arch: move common mmap flags to |
| 7 | linux/mman.h") moved a few mmap flags, particularly MAP_PRIVATE, from |
| 8 | asm/mman.h to linux/mman.h. This broke klibc's build, which uses |
| 9 | MAP_PRIVATE. |
| 10 | |
| 11 | linux/mman.h includes asm/mman.h, so this commit merely includes |
| 12 | linux/mman.h instead of asm/mman.h. |
| 13 | |
| 14 | Signed-off-by: Barret Rhoden <brho@google.com> |
| 15 | Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| 16 | --- |
| 17 | Upstream-Status: Backport [https://git.kernel.org/pub/scm/libs/klibc/klibc.git/commit/?id=d4853d030639cf3542ae39129c18b654d8d4f020] |
| 18 | usr/include/sys/mman.h | 2 +- |
| 19 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 20 | |
| 21 | diff --git a/usr/include/sys/mman.h b/usr/include/sys/mman.h |
| 22 | index 56f0b65c..3fd626e7 100644 |
| 23 | --- a/usr/include/sys/mman.h |
| 24 | +++ b/usr/include/sys/mman.h |
| 25 | @@ -7,7 +7,7 @@ |
| 26 | |
| 27 | #include <klibc/extern.h> |
| 28 | #include <sys/types.h> |
| 29 | -#include <asm/mman.h> |
| 30 | +#include <linux/mman.h> |
| 31 | |
| 32 | #define MAP_FAILED ((void *)-1) |
| 33 | |
| 34 | -- |
| 35 | 2.23.0 |
| 36 | |