From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58156) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGtVr-0004Xp-3L for qemu-devel@nongnu.org; Mon, 20 Nov 2017 16:21:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eGtVq-0007lu-CK for qemu-devel@nongnu.org; Mon, 20 Nov 2017 16:21:55 -0500 Received: from mail-lf0-x241.google.com ([2a00:1450:4010:c07::241]:33260) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eGtVq-0007jO-4d for qemu-devel@nongnu.org; Mon, 20 Nov 2017 16:21:54 -0500 Received: by mail-lf0-x241.google.com with SMTP id x68so11726863lff.0 for ; Mon, 20 Nov 2017 13:21:54 -0800 (PST) From: riku.voipio@linaro.org Date: Mon, 20 Nov 2017 23:21:33 +0200 Message-Id: In-Reply-To: References: Subject: [Qemu-devel] [PULL 05/15] linux-user/hppa: Fix TARGET_MAP_TYPE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Helge Deller From: Helge Deller 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 Signed-off-by: Richard Henderson Message-ID: <20170311175019.GA7195@ls3530.fritz.box> Signed-off-by: Riku Voipio --- linux-user/syscall_defs.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) -- 2.14.2