diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch b/meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch index 41626eb87c..066ea7865a 100644 --- a/meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch +++ b/meta/recipes-devtools/qemu/qemu/0011-Revert-linux-user-fix-mmap-munmap-mprotect-mremap-sh.patch @@ -1,4 +1,4 @@ -From 3ed26be2091436296933ed2146f7269c791c7bfe Mon Sep 17 00:00:00 2001 +From 496231774f8bc17ecfaf543a6603e3cad3f3f74e Mon Sep 17 00:00:00 2001 From: Martin Jansa <martin.jansa@lge.com> Date: Fri, 1 Jun 2018 08:41:07 +0000 Subject: [PATCH] Revert "linux-user: fix mmap/munmap/mprotect/mremap/shmat" @@ -14,6 +14,7 @@ http://lists.openembedded.org/pipermail/openembedded-core/2018-June/151382.html This reverts commit ebf9a3630c911d0cfc9c20f7cafe9ba4f88cf583. Upstream-Status: Pending + --- include/exec/cpu-all.h | 6 +----- include/exec/cpu_ldst.h | 16 +++++++++------- @@ -22,10 +23,10 @@ Upstream-Status: Pending 4 files changed, 15 insertions(+), 29 deletions(-) diff --git a/include/exec/cpu-all.h b/include/exec/cpu-all.h -index f4fa94e966..0b141683f0 100644 +index 117d2fbb..90558c14 100644 --- a/include/exec/cpu-all.h +++ b/include/exec/cpu-all.h -@@ -159,12 +159,8 @@ extern unsigned long guest_base; +@@ -163,12 +163,8 @@ extern unsigned long guest_base; extern int have_guest_base; extern unsigned long reserved_va; @@ -40,12 +41,12 @@ index f4fa94e966..0b141683f0 100644 #include "exec/hwaddr.h" diff --git a/include/exec/cpu_ldst.h b/include/exec/cpu_ldst.h -index 5de8c8a5af..191f2e962a 100644 +index 95906849..ed17b3f6 100644 --- a/include/exec/cpu_ldst.h +++ b/include/exec/cpu_ldst.h -@@ -51,13 +51,15 @@ +@@ -62,13 +62,15 @@ typedef uint64_t abi_ptr; /* All direct uses of g2h and h2g need to go away for usermode softmmu. */ - #define g2h(x) ((void *)((unsigned long)(target_ulong)(x) + guest_base)) + #define g2h(x) ((void *)((unsigned long)(abi_ptr)(x) + guest_base)) -#define guest_addr_valid(x) ((x) <= GUEST_ADDR_MAX) -#define h2g_valid(x) guest_addr_valid((unsigned long)(x) - guest_base) @@ -67,10 +68,10 @@ index 5de8c8a5af..191f2e962a 100644 #define h2g_nocheck(x) ({ \ unsigned long __ret = (unsigned long)(x) - guest_base; \ diff --git a/linux-user/mmap.c b/linux-user/mmap.c -index 9168a2051c..de85669aab 100644 +index 41e0983c..d0ee1c53 100644 --- a/linux-user/mmap.c +++ b/linux-user/mmap.c -@@ -80,7 +80,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) +@@ -79,7 +79,7 @@ int target_mprotect(abi_ulong start, abi_ulong len, int prot) return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); end = start + len; @@ -79,7 +80,7 @@ index 9168a2051c..de85669aab 100644 return -TARGET_ENOMEM; } prot &= PROT_READ | PROT_WRITE | PROT_EXEC; -@@ -482,8 +482,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, +@@ -490,8 +490,8 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, * It can fail only on 64-bit host with 32-bit target. * On any other target/host host mmap() handles this error correctly. */ @@ -90,7 +91,7 @@ index 9168a2051c..de85669aab 100644 goto fail; } -@@ -623,10 +623,8 @@ int target_munmap(abi_ulong start, abi_ulong len) +@@ -631,10 +631,8 @@ int target_munmap(abi_ulong start, abi_ulong len) if (start & ~TARGET_PAGE_MASK) return -TARGET_EINVAL; len = TARGET_PAGE_ALIGN(len); @@ -102,7 +103,7 @@ index 9168a2051c..de85669aab 100644 mmap_lock(); end = start + len; real_start = start & qemu_host_page_mask; -@@ -681,13 +679,6 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, +@@ -689,13 +687,6 @@ abi_long target_mremap(abi_ulong old_addr, abi_ulong old_size, int prot; void *host_addr; @@ -117,10 +118,10 @@ index 9168a2051c..de85669aab 100644 if (flags & MREMAP_FIXED) { diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index 643b8833de..271f215147 100644 +index 280137da..efdd0006 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -4919,9 +4919,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, +@@ -3818,9 +3818,6 @@ static inline abi_ulong do_shmat(CPUArchState *cpu_env, return -TARGET_EINVAL; } } @@ -130,7 +131,7 @@ index 643b8833de..271f215147 100644 mmap_lock(); -@@ -7497,7 +7494,7 @@ static int open_self_maps(void *cpu_env, int fd) +@@ -6582,7 +6579,7 @@ static int open_self_maps(void *cpu_env, int fd) } if (h2g_valid(min)) { int flags = page_get_flags(h2g(min)); |