summaryrefslogtreecommitdiff
path: root/recipes/qemu/qemu-0.9.1+svn/fix_brk.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes/qemu/qemu-0.9.1+svn/fix_brk.patch')
-rw-r--r--recipes/qemu/qemu-0.9.1+svn/fix_brk.patch59
1 files changed, 0 insertions, 59 deletions
diff --git a/recipes/qemu/qemu-0.9.1+svn/fix_brk.patch b/recipes/qemu/qemu-0.9.1+svn/fix_brk.patch
deleted file mode 100644
index f15e001dd6..0000000000
--- a/recipes/qemu/qemu-0.9.1+svn/fix_brk.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: trunk/linux-user/syscall.c
-===================================================================
---- trunk.orig/linux-user/syscall.c 2008-04-24 20:16:24.000000000 +0100
-+++ trunk/linux-user/syscall.c 2008-04-24 20:16:32.000000000 +0100
-@@ -440,7 +440,7 @@
- if (!new_brk)
- return target_brk;
- if (new_brk < target_original_brk)
-- return -TARGET_ENOMEM;
-+ return target_brk;
-
- brk_page = HOST_PAGE_ALIGN(target_brk);
-
-@@ -455,12 +455,11 @@
- mapped_addr = get_errno(target_mmap(brk_page, new_alloc_size,
- PROT_READ|PROT_WRITE,
- MAP_ANON|MAP_FIXED|MAP_PRIVATE, 0, 0));
-- if (is_error(mapped_addr)) {
-- return mapped_addr;
-- } else {
-+
-+ if (!is_error(mapped_addr))
- target_brk = new_brk;
-- return target_brk;
-- }
-+
-+ return target_brk;
- }
-
- static inline abi_long copy_from_user_fdset(fd_set *fds,
-Index: trunk/linux-user/mmap.c
-===================================================================
---- trunk.orig/linux-user/mmap.c 2008-04-24 20:16:16.000000000 +0100
-+++ trunk/linux-user/mmap.c 2008-04-24 20:16:32.000000000 +0100
-@@ -264,6 +264,9 @@
- host_start += offset - host_offset;
- start = h2g(host_start);
- } else {
-+ int flg;
-+ target_ulong addr;
-+
- if (start & ~TARGET_PAGE_MASK) {
- errno = EINVAL;
- return -1;
-@@ -271,6 +274,14 @@
- end = start + len;
- real_end = HOST_PAGE_ALIGN(end);
-
-+ for(addr = real_start; addr < real_end; addr += TARGET_PAGE_SIZE) {
-+ flg = page_get_flags(addr);
-+ if( flg & PAGE_RESERVED ) {
-+ errno = ENXIO;
-+ return -1;
-+ }
-+ }
-+
- /* worst case: we cannot map the file because the offset is not
- aligned, so we read it */
- if (!(flags & MAP_ANONYMOUS) &&