summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2018-08-10 13:06:43 -0700
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-01-01 20:03:46 -0800
commit0ad4c88146cc71c48da9b04da9b2b5a6982a0187 (patch)
treed39f2d33543630932ff808e739558bc71b24e45b /meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch
parente6afbac641b6d4229fcb680ae9e1df8eb6f8165a (diff)
downloadmeta-xilinx-0ad4c88146cc71c48da9b04da9b2b5a6982a0187.tar.gz
Update recipes for Xilinx v2018.3 release
Update the arm-trusted-firmware, u-boot-xlnx, linux-xlnx, qemu-xilinx and qemu-devicetrees recipes for 2018.3 release Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
Diffstat (limited to 'meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch')
-rw-r--r--meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch b/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch
deleted file mode 100644
index 62e8d380..00000000
--- a/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001
5From: Paolo Bonzini <pbonzini@redhat.com>
6Date: Tue, 28 Nov 2017 11:51:27 +0100
7Subject: [PATCH] memfd: fix configure test
8MIME-Version: 1.0
9Content-Type: text/plain; charset=UTF-8
10Content-Transfer-Encoding: 8bit
11
12Recent glibc added memfd_create in sys/mman.h. This conflicts with
13the definition in util/memfd.c:
14
15 /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration
16
17Fix the configure test, and remove the sys/memfd.h inclusion since the
18file actually does not exist---it is a typo in the memfd_create(2) man
19page.
20
21Cc: Marc-André Lureau <marcandre.lureau@redhat.com>
22Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
23---
24 configure | 2 +-
25 util/memfd.c | 4 +---
26 2 files changed, 2 insertions(+), 4 deletions(-)
27
28diff --git a/configure b/configure
29index 9c8aa5a98b..99ccc1725a 100755
30--- a/configure
31+++ b/configure
32@@ -3923,7 +3923,7 @@ fi
33 # check if memfd is supported
34 memfd=no
35 cat > $TMPC << EOF
36-#include <sys/memfd.h>
37+#include <sys/mman.h>
38
39 int main(void)
40 {
41diff --git a/util/memfd.c b/util/memfd.c
42index 4571d1aba8..412e94a405 100644
43--- a/util/memfd.c
44+++ b/util/memfd.c
45@@ -31,9 +31,7 @@
46
47 #include "qemu/memfd.h"
48
49-#ifdef CONFIG_MEMFD
50-#include <sys/memfd.h>
51-#elif defined CONFIG_LINUX
52+#if defined CONFIG_LINUX && !defined CONFIG_MEMFD
53 #include <sys/syscall.h>
54 #include <asm/unistd.h>
55
56--
572.11.0