summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2011-03-16 17:40:36 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-25 16:38:12 +0000
commit7c62b36a34f3b1491bf3df6a559bc0a74c74c173 (patch)
tree486fc3da0426a673b3778495bbe59a6441f007aa /meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
parentfcb1b5a4d76f18d5cc1a0327ce41f6c188da6618 (diff)
downloadpoky-7c62b36a34f3b1491bf3df6a559bc0a74c74c173.tar.gz
qemu: Upgrade 0.13.0 -> 0.14.0
* ppc-hack patch is dropped. * Other patches which were direct backports or has been merged upstream in 0.14.0 are also dropped (From OE-Core rev: 97fbdfdbfb15de325fd148bcecc9187d0f778db5) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch')
-rw-r--r--meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch37
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch b/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
deleted file mode 100644
index 7c782b92a4..0000000000
--- a/meta/recipes-devtools/qemu/qemu-0.13.0/fallback-to-safe-mmap_min_addr.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From c313f89c33217ac0e471554dace2144718f86669 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 13 May 2010 12:23:40 +0200
4Subject: [PATCH] linux-user: use default mmap_min_addr 65536 when /proc/sys/vm/mmap_min_addr cannot be read
5
6* 65536 is default at least for ubuntu and fedora.
7---
8 linux-user/main.c | 5 +++++
9 1 files changed, 5 insertions(+), 0 deletions(-)
10
11Index: qemu-0.13.0/linux-user/main.c
12===================================================================
13--- qemu-0.13.0.orig/linux-user/main.c
14+++ qemu-0.13.0/linux-user/main.c
15@@ -36,6 +36,7 @@
16 #include "envlist.h"
17
18 #define DEBUG_LOGFILE "/tmp/qemu.log"
19+#define MMAP_MIN_ADDR_DEFAULT 65536
20
21 char *exec_path;
22
23@@ -2973,8 +2974,14 @@ int main(int argc, char **argv, char **e
24 if (fscanf(fp, "%lu", &tmp) == 1) {
25 mmap_min_addr = tmp;
26 qemu_log("host mmap_min_addr=0x%lx\n", mmap_min_addr);
27+ } else {
28+ qemu_log("cannot read value from /proc/sys/vm/mmap_min_addr, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
29+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
30 }
31 fclose(fp);
32+ } else {
33+ qemu_log("cannot open /proc/sys/vm/mmap_min_addr for reading, assuming %d\n", MMAP_MIN_ADDR_DEFAULT);
34+ mmap_min_addr = MMAP_MIN_ADDR_DEFAULT;
35 }
36 }
37