diff options
| author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 15:56:31 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-05 15:56:31 +0000 |
| commit | 55be33fd92859684db70a605c33b2c99a2c1a0f3 (patch) | |
| tree | 45d9b9fa480d28571cb2780a1fe88b7b0f43e3d2 /meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch | |
| parent | 5273e39edfeef73d0866276b447160cd7b1e9ecc (diff) | |
| download | poky-55be33fd92859684db70a605c33b2c99a2c1a0f3.tar.gz | |
qemu: Upgrade to latest svn removing a ton of merged patches (yay)
Diffstat (limited to 'meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch')
| -rw-r--r-- | meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch b/meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch deleted file mode 100644 index 02f093abb9..0000000000 --- a/meta/packages/qemu/qemu-0.9.1+svn/qemu-amd64-32b-mapping-0.9.0.patch +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | --- | ||
| 2 | linux-user/mmap.c | 8 ++++++-- | ||
| 3 | 1 file changed, 6 insertions(+), 2 deletions(-) | ||
| 4 | |||
| 5 | Index: trunk/linux-user/mmap.c | ||
| 6 | =================================================================== | ||
| 7 | --- trunk.orig/linux-user/mmap.c 2008-04-24 20:15:37.000000000 +0100 | ||
| 8 | +++ trunk/linux-user/mmap.c 2008-04-24 20:16:16.000000000 +0100 | ||
| 9 | @@ -29,6 +29,10 @@ | ||
| 10 | |||
| 11 | //#define DEBUG_MMAP | ||
| 12 | |||
| 13 | +#ifndef MAP_32BIT | ||
| 14 | +#define MAP_32BIT 0 | ||
| 15 | +#endif | ||
| 16 | + | ||
| 17 | /* NOTE: all the constants are the HOST ones, but addresses are target. */ | ||
| 18 | int target_mprotect(abi_ulong start, abi_ulong len, int prot) | ||
| 19 | { | ||
| 20 | @@ -251,7 +255,7 @@ | ||
| 21 | especially important if qemu_host_page_size > | ||
| 22 | qemu_real_host_page_size */ | ||
| 23 | p = mmap(g2h(mmap_start), | ||
| 24 | - host_len, prot, flags | MAP_FIXED, fd, host_offset); | ||
| 25 | + host_len, prot, flags | MAP_FIXED | MAP_32BIT, fd, host_offset); | ||
| 26 | if (p == MAP_FAILED) | ||
| 27 | return -1; | ||
| 28 | /* update start so that it points to the file position at 'offset' */ | ||
| 29 | @@ -406,7 +410,7 @@ | ||
| 30 | unsigned long host_addr; | ||
| 31 | |||
| 32 | /* XXX: use 5 args syscall */ | ||
| 33 | - host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags); | ||
| 34 | + host_addr = (long)mremap(g2h(old_addr), old_size, new_size, flags | MAP_32BIT); | ||
| 35 | if (host_addr == -1) | ||
| 36 | return -1; | ||
| 37 | new_addr = h2g(host_addr); | ||
