diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-09 10:32:03 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2007-08-09 10:32:03 +0000 |
commit | a21e133e77926e931c33788864350f0183dbde7c (patch) | |
tree | 882e4f07fb4701aa989e457cd4ff7c8417d63274 /meta/packages/qemu/files | |
parent | 0460e717e60bc11d00e222fd0b126702f9044f54 (diff) | |
download | poky-a21e133e77926e931c33788864350f0183dbde7c.tar.gz |
qemu-native: unbreak on amd64 - patch taken from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2419 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/qemu/files')
-rw-r--r-- | meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch new file mode 100644 index 0000000000..8f5e9d8b4b --- /dev/null +++ b/meta/packages/qemu/files/qemu-amd64-32b-mapping-0.9.0.patch | |||
@@ -0,0 +1,21 @@ | |||
1 | diff -Naru qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c qemu-snapshot-2007-07-01_05/linux-user/mmap.c | ||
2 | --- qemu-snapshot-2007-07-01_05.orig/linux-user/mmap.c 2007-06-03 17:31:32.000000000 +0200 | ||
3 | +++ qemu-snapshot-2007-07-01_05/linux-user/mmap.c 2007-07-02 14:00:30.000000000 +0200 | ||
4 | @@ -234,7 +234,7 @@ | ||
5 | host_offset = offset & qemu_host_page_mask; | ||
6 | host_len = len + offset - host_offset; | ||
7 | host_start = (long)mmap(real_start ? g2h(real_start) : NULL, | ||
8 | - host_len, prot, flags, fd, host_offset); | ||
9 | + host_len, prot, (flags | MAP_32BIT), fd, host_offset); | ||
10 | if (host_start == -1) | ||
11 | return host_start; | ||
12 | /* update start so that it points to the file position at 'offset' */ | ||
13 | @@ -388,7 +388,7 @@ | ||
14 | int prot; | ||
15 | |||
16 | /* XXX: use 5 args syscall */ | ||
17 | - new_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags); | ||
18 | + new_addr = (long)mremap(g2h(old_addr), old_size, new_size, (flags | MAP_32BIT)); | ||
19 | if (new_addr == -1) | ||
20 | return new_addr; | ||
21 | new_addr = h2g(new_addr); | ||