[PULL,05/15] linux-user/hppa: Fix TARGET_MAP_TYPE

Message ID	e65be6a7cfe5c991d97ef259c6a88e99ca65e875.1511212753.git.riku.voipio@linaro.org
State	Accepted
Commit	e65be6a7cfe5c991d97ef259c6a88e99ca65e875
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 20 Nov 2017 23:21:33 +0200 Message-Id: <e65be6a7cfe5c991d97ef259c6a88e99ca65e875.1511212753.git.riku.voipio@linaro.org> In-Reply-To: <cover.1511212753.git.riku.voipio@linaro.org> References: <cover.1511212753.git.riku.voipio@linaro.org> Subject: [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE Precedence: list Cc: Helge Deller <deller@gmx.de> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	late linux-user fixes for 2.11 \| expand [PULL,00/15] late linux-user fixes for 2.11 [PULL,01/15] linux-user: Restrict usage of sa_restorer [PULL,02/15] linux-user/hppa: Fix TARGET_SA_* defines [PULL,03/15] linux-user/hppa: Fix cpu_clone_regs [PULL,04/15] linux-user/hppa: Fix typo for TARGET_NR_epoll_wait [PULL,05/15] linux-user/hppa: Fix TARGET_MAP_TYPE [PULL,06/15] linux-user/hppa: Fix TARGET_F_RDLCK, TARGET_F_WRLCK, TARGET_F_UNLCK [PULL,07/15] linux-user: Handle TARGET_MAP_STACK and TARGET_MAP_HUGETLB [PULL,08/15] linux-user/syscall.c: Handle SH4's exceptional alignment for p{read, write}64 [PULL,09/15] linux-user: fix 'finshed' typo in comment [PULL,10/15] linux-user: return EINVAL from prctl(PR_*_SECCOMP) [PULL,11/15] linux-user/s390x: Mask si_addr for SIGSEGV [PULL,12/15] linux-user/ppc: Report correct fault address for data faults [PULL,13/15] linux-user/sparc: Put address for data faults where linux-user expects it [PULL,14/15] linux-user: Handle rt_sigaction correctly for SPARC [PULL,15/15] linux-user: Fix calculation of auxv length

Message ID

e65be6a7cfe5c991d97ef259c6a88e99ca65e875.1511212753.git.riku.voipio@linaro.org

State

Accepted

Commit

e65be6a7cfe5c991d97ef259c6a88e99ca65e875

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: riku.voipio@linaro.org
To: qemu-devel@nongnu.org
Date: Mon, 20 Nov 2017 23:21:33 +0200
Message-Id: <e65be6a7cfe5c991d97ef259c6a88e99ca65e875.1511212753.git.riku.voipio@linaro.org>
In-Reply-To: <cover.1511212753.git.riku.voipio@linaro.org>
References: <cover.1511212753.git.riku.voipio@linaro.org>
Subject: [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE
Precedence: list
Cc: Helge Deller <deller@gmx.de>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

late linux-user fixes for 2.11 | expand

Commit Message

Riku Voipio Nov. 20, 2017, 9:21 p.m. UTC

From: Helge Deller <deller@gmx.de>


TARGET_MAP_TYPE needs to be 0x03 instead of 0x0f on the hppa
architecture, otherwise it conflicts with MAP_FIXED which is 0x04.

Signed-off-by: Helge Deller <deller@gmx.de>

Signed-off-by: Richard Henderson <rth@twiddle.net>

Message-ID: <20170311175019.GA7195@ls3530.fritz.box>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>

---
 linux-user/syscall_defs.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

-- 
2.14.2

diff --git a/linux-user/syscall_defs.h b/linux-user/syscall_defs.h
index 38339ecb9a..a6ed30d70e 100644
--- a/linux-user/syscall_defs.h
+++ b/linux-user/syscall_defs.h
@@ -1336,7 +1336,11 @@  struct target_winsize {
 /* Common */
 #define TARGET_MAP_SHARED	0x01		/* Share changes */
 #define TARGET_MAP_PRIVATE	0x02		/* Changes are private */
-#define TARGET_MAP_TYPE		0x0f		/* Mask for type of mapping */
+#if defined(TARGET_HPPA)
+#define TARGET_MAP_TYPE         0x03		/* Mask for type of mapping */
+#else
+#define TARGET_MAP_TYPE         0x0f		/* Mask for type of mapping */
+#endif
 
 /* Target specific */
 #if defined(TARGET_MIPS)

[PULL,05/15] linux-user/hppa: Fix TARGET_MAP_TYPE

Commit Message

Patch