1 files changed, 37 insertions, 0 deletions

diff --git a/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch
new file mode 100644
index 0000000000..40ab59c762
--- /dev/null
+++ b/meta/packages/qemu/qemu-0.9.1+svnr6190/qemu-amd64-32b-mapping-0.9.0.patch
@@ -0,0 +1,37 @@
+---
+ linux-user/mmap.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+Index: trunk/linux-user/mmap.c
+===================================================================
+--- trunk.orig/linux-user/mmap.c        2009-01-05 11:09:58.000000000 +0000
++++ trunk/linux-user/mmap.c     2009-01-05 12:46:33.000000000 +0000
+@@ -122,6 +122,10 @@
+     munmap(p, *p);
+ }
+ 
++#ifndef MAP_32BIT
++#define MAP_32BIT 0
++#endif
++
+ /* NOTE: all the constants are the HOST ones, but addresses are target. */
+ int target_mprotect(abi_ulong start, abi_ulong len, int prot)
+ {
+@@ -365,7 +369,7 @@
+            especially important if qemu_host_page_size >
+            qemu_real_host_page_size */
+         p = mmap(g2h(mmap_start),
+-                 host_len, prot, flags | MAP_FIXED, fd, host_offset);
++                 host_len, prot, flags | MAP_FIXED | MAP_32BIT, fd, host_offset);
+         if (p == MAP_FAILED)
+             goto fail;
+         /* update start so that it points to the file position at 'offset' */
+@@ -567,7 +571,7 @@
+                                          flags | MREMAP_FIXED,
+                                          g2h(mmap_start));
+     } else {
+-        host_addr = mremap(g2h(old_addr), old_size, new_size, flags);
++        host_addr = mremap(g2h(old_addr), old_size, new_size, flags | MAP_32BIT);
+         /* Check if address fits target address space */
+         if ((unsigned long)host_addr + new_size > (abi_ulong)-1) {
+             /* Revert mremap() changes */