diff options
Diffstat (limited to 'meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch')
| -rw-r--r-- | meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch b/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch index 783198d9e3..f15e001dd6 100644 --- a/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch +++ b/meta/packages/qemu/qemu-0.9.1+svn/fix_brk.patch | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | --- qemu/linux-user/syscall.c1 (revision 16) | 1 | Index: trunk/linux-user/syscall.c |
| 2 | +++ qemu/linux-user/syscall.c (working copy) | 2 | =================================================================== |
| 3 | @@ -441,7 +441,7 @@ | 3 | --- trunk.orig/linux-user/syscall.c 2008-04-24 20:16:24.000000000 +0100 |
| 4 | +++ trunk/linux-user/syscall.c 2008-04-24 20:16:32.000000000 +0100 | ||
| 5 | @@ -440,7 +440,7 @@ | ||
| 4 | if (!new_brk) | 6 | if (!new_brk) |
| 5 | return target_brk; | 7 | return target_brk; |
| 6 | if (new_brk < target_original_brk) | 8 | if (new_brk < target_original_brk) |
| @@ -9,7 +11,7 @@ | |||
| 9 | 11 | ||
| 10 | brk_page = HOST_PAGE_ALIGN(target_brk); | 12 | brk_page = HOST_PAGE_ALIGN(target_brk); |
| 11 | 13 | ||
| 12 | @@ -456,12 +456,11 @@ | 14 | @@ -455,12 +455,11 @@ |
| 13 | mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size, | 15 | mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size, |
| 14 | PROT_READ|PROT_WRITE, | 16 | PROT_READ|PROT_WRITE, |
| 15 | MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0)); | 17 | MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0)); |
| @@ -26,9 +28,11 @@ | |||
| 26 | } | 28 | } |
| 27 | 29 | ||
| 28 | static inline abi_long copy_from_user_fdset(fd_set *fds, | 30 | static inline abi_long copy_from_user_fdset(fd_set *fds, |
| 29 | --- qemu/linux-user/mmap.c1 (revision 16) | 31 | Index: trunk/linux-user/mmap.c |
| 30 | +++ qemu/linux-user/mmap.c (working copy) | 32 | =================================================================== |
| 31 | @@ -260,6 +259,9 @@ | 33 | --- trunk.orig/linux-user/mmap.c 2008-04-24 20:16:16.000000000 +0100 |
| 34 | +++ trunk/linux-user/mmap.c 2008-04-24 20:16:32.000000000 +0100 | ||
| 35 | @@ -264,6 +264,9 @@ | ||
| 32 | host_start += offset - host_offset; | 36 | host_start += offset - host_offset; |
| 33 | start = h2g(host_start); | 37 | start = h2g(host_start); |
| 34 | } else { | 38 | } else { |
| @@ -38,7 +42,7 @@ | |||
| 38 | if (start & ~TARGET_PAGE_MASK) { | 42 | if (start & ~TARGET_PAGE_MASK) { |
| 39 | errno = EINVAL; | 43 | errno = EINVAL; |
| 40 | return -1; | 44 | return -1; |
| 41 | @@ -267,6 +269,14 @@ | 45 | @@ -271,6 +274,14 @@ |
| 42 | end = start + len; | 46 | end = start + len; |
| 43 | real_end = HOST_PAGE_ALIGN(end); | 47 | real_end = HOST_PAGE_ALIGN(end); |
| 44 | 48 | ||
