From patchwork Tue Oct 31 12:53:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 117609 Delivered-To: patch@linaro.org Received: by 10.80.245.45 with SMTP id t42csp3920200edm; Tue, 31 Oct 2017 05:55:08 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RsAZc9akvhYbkADuFwR6OR4SNuTG0IJdbNati/EgFYKyThZfswmeh1PC/nT/hE5VHZCjx4 X-Received: by 10.129.131.135 with SMTP id t129mr1083106ywf.33.1509454508148; Tue, 31 Oct 2017 05:55:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509454508; cv=none; d=google.com; s=arc-20160816; b=GxXSAwJu3kOn4M+9sdzu7veVmZLO463K1UPhbf4p16Mq6BfgJvxXIlp+HyNye4MtWt Cl6Yn6gg0VGRsLB6CY7ikB5+VZJEL6MHoPyOSAesQKuZL6OX9GkVHFoOfBEbEIb6mvhG yXMUo7zJqJIkyZ7kLe0KaT1y+mCpQRpts9Ux7wbN1BzdL4AcqpnVcudnfQHzFr9yINEl /ji/wK3X6Hn2t6pkszqFxkWn3r/gzJAz6y3Y5Cm0oiKCicjd4FQdWkxoA7+gaaM7hPj9 mxzRptjAqbZgVJaz3puVuAIzQ9lMBHpXXClu83zlN3HAXC1/PGrFh2t1jg+S6TVFSMYx 4SZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=LR7eUZczssc2NlogUPo0YhRaOLDBKqKPuwYxdVCLnrk=; b=sgb3Xwbrc15DItafOx/C6ZDrn03Q/IWQSvG3V05IigqNxW3bwnjyvEENNQyQyIsfQc LfUcRqKz8Tn5RXr6FyX9i6HnccS2U8qsw8/MCfACF2jwl7LNf4nkIj457IcV8W/RLK7D a8yJ0IT8T6/RTE0JrzykRgTq5qhAEeCfF6gosMkGq12dTI7KZANUo9KwBVHFD8Ijnexm BN6sT6fY8bT47gRt47sHhMr+p7cz8XAOoHChKHmvavSxw5U46voTT3L4gMSqj+jWFzTt jhGEhyxOq15HCxH6TeOCVeasA5aOQg9gFKf27GkT3RfEO2sm0pVjnvrz6u0TepYdf+bC WxWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Qv2XIaiE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id a18si368291ybh.278.2017.10.31.05.55.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 31 Oct 2017 05:55:08 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Qv2XIaiE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45501 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9W4R-0002b6-Gc for patch@linaro.org; Tue, 31 Oct 2017 08:55:07 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e9W42-0002Yg-Bc for qemu-devel@nongnu.org; Tue, 31 Oct 2017 08:54:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e9W3y-0005TL-6i for qemu-devel@nongnu.org; Tue, 31 Oct 2017 08:54:42 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:48434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e9W3x-0005Rg-VZ for qemu-devel@nongnu.org; Tue, 31 Oct 2017 08:54:38 -0400 Received: by mail-wr0-x241.google.com with SMTP id 15so15849621wrb.5 for ; Tue, 31 Oct 2017 05:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LR7eUZczssc2NlogUPo0YhRaOLDBKqKPuwYxdVCLnrk=; b=Qv2XIaiE6KmwPm5HbE/ZLdnnfQVvgzuSXMzQ3w8dx1HwYr8ZLzUMdJLHmPm7PS8jKU L42YPbz0JtEndvNvokpLhJSNLlvICAVBCgq3jvyHPXCkSs9WQLtAxf1peIPByuyDYdxE i/zKpiTNzOdX+tCJyEDWuEG7ukkteh/PJgPyo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LR7eUZczssc2NlogUPo0YhRaOLDBKqKPuwYxdVCLnrk=; b=pNG6WEAlPu3VV8QFktU4yCDFEbshAjKwlqBiJsofjJozRjohqK8EAtEu/ZVubcRN35 xIn7vIPHLrh1CmTQqz+F+7KQ+31Hcnv9TEpUkvn6chfmpxSpmqUtpowhwgMHuLTTjAOi wPPOloZKRqXC7Co6zoJJwegnLcIbCaSxXMwJ6WAbr5J+dOp8OUA/cplwCJy6v8MC9xYl IvX7kctSfjKfnYIiXGlmXOtKSHuPlTfb+HL7jK2MG7GVlWSsMWnoSFxEDY9I+qBRukYc ZZ/IizU2wfKBjZwiB4vF1dhZugC83ajKQHbYexxkZ1CkA6yNO8jVNMn/iynHDDhXN4bI kv6w== X-Gm-Message-State: AMCzsaUe8q5lvtDRR5Rjz5r4KvBGnGr21QkjBfjQpkq8VhmOUYowYAGL wdy8AVUq13pVGIQRh7uxJwEo3nG6h8I= X-Received: by 10.223.135.90 with SMTP id 26mr1692088wrz.114.1509454476620; Tue, 31 Oct 2017 05:54:36 -0700 (PDT) Received: from cloudburst.twiddle.net.ASUS (p57A4515F.dip0.t-ipconnect.de. [87.164.81.95]) by smtp.gmail.com with ESMTPSA id e131sm999011wmg.15.2017.10.31.05.54.28 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 31 Oct 2017 05:54:35 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 31 Oct 2017 13:53:56 +0100 Message-Id: <20171031125358.23377-6-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171031125358.23377-1-richard.henderson@linaro.org> References: <20171031125358.23377-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::241 Subject: [Qemu-devel] [PATCH 5/7] linux-user/hppa: Fix TARGET_MAP_TYPE X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Helge Deller , riku.voipio@iki.fi, Richard Henderson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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> --- linux-user/syscall_defs.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.13.6 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)