From patchwork Mon Nov 20 21:21:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Riku Voipio X-Patchwork-Id: 119318 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp4392972qgn; Mon, 20 Nov 2017 13:25:05 -0800 (PST) X-Google-Smtp-Source: AGs4zMb/shBw55FSY6rd/dEtQhEQ4ybTMHNvuYRfK/2h/tiZY3WEs97Lg6RGSwNgL0xw/QKAhgpQ X-Received: by 10.37.20.9 with SMTP id 9mr9221222ybu.283.1511213105686; Mon, 20 Nov 2017 13:25:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1511213105; cv=none; d=google.com; s=arc-20160816; b=0BzzTxc84BD2xhyg37eYKVyiFLdqxv1MNQQNp5OwU69dzbT1BFSEDfgW12UoAfZdi7 YxVLY0hzhCGEJZsPrS5554OxPjUfiquDDIsofek3AZ0T3Og1XD5W1OgZcZDBg8AswB7R +yE2sgo+WtGrzos4ppWSonmwxu3b+ttEq+OC9b1gh31mK8b6UjteeZcT34aCeHCOauPD AsuR7oWu2Xwb3Gq4HnkHIuvXBTixxhZCmFN9Jpi2e9/hXbjvtUbK80c4aPcAR6zXZD4U w8ZPpziFG51XNRW8oZ8BaDdfE5muH/zq9bCS3LsSzfcwiweHnaVFVyRc3gDE4uM/3WNW T5kQ== 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=0v2vk1Y3Y4d0OmkNLC869msKfFN1j7oP0J00tPup+YI=; b=sTeZ80ULKX4bLQ6hbDUGe1BkeErMqJa7jd43i9fF7IQwqNqWC4kQUJ5wiCdovX5gxS lV8JXZi7CkvN85VwTuGNiVdnrIYBundonfU1XwDecsZCYQkVLSdVEKMLo1/T1cvKICeL IGsrfm+1H3H946783s4BQRczhcghaA9Ik+x9n3RXEscXSVYpWdlmSI09eovvneVuVgNs u80i/f8EJMXlXpzk3JgSeGGEzYHOOu3qHF9ViiPoPK3BqfXHs8kE7zmdo46ojBn59OcE /seutyXMXBkchx6KvpmXaSLdRFFtmIB45ZR2+zDGPX/1OlHvNg6QlEllpYFHjLNqBJM4 nx3Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Pq3aFMd3; 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 t66si2403062ywd.602.2017.11.20.13.25.05 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 20 Nov 2017 13:25:05 -0800 (PST) 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=Pq3aFMd3; 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]:59812 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eGtYv-0006s4-63 for patch@linaro.org; Mon, 20 Nov 2017 16:25:05 -0500 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) 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=0v2vk1Y3Y4d0OmkNLC869msKfFN1j7oP0J00tPup+YI=; b=Pq3aFMd3kdkJ6RV0CgOKBspSDyaTdr2U8Cnr3A9+l/rrEe9NeBQu/pahttjsB3I3PK LUEVeNth73QIyCFUba20A2RDPS5h1jrLt83t2terVFICD5xah2TToCQVTEp01yaw1YyC x9ngbmHhyIArNfZL56AfX4vyejYve5yV7t8aQ= 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=0v2vk1Y3Y4d0OmkNLC869msKfFN1j7oP0J00tPup+YI=; b=pAj/+6VqCeJpUDWWMitFRRHNtVBStndDNyef6KQ5nvRJvKZgMwJdDlxu0TLEAbwyZk sMHo9wpRo36HxWLwNHaKvimmnxxyQI0XZ+Bv9qNylTtaTkY0Q/nRG1dbcAKZBuSXUgIy 5co2LTVbaG1WfMe9uAfcgkz8w6TmqcMkTEi//3b8JH2vj6jaQc7rYxkavLGGXTICI9iM 3jvBH863SIey83ZAuYb9H+G1Q3YJm0Vhjgad5Vp25st0bFBJBOyJ6CJzA1YSSLvaG0zf Uaoz1+lLwqrv6BHuH1KARMNvd+uRPh/5T0ctx57Xn2vdmG6UzNjjl7fK6q/mAdfbPYEn 2Mpg== X-Gm-Message-State: AJaThX4LakCxVcrz3WmBZqobEK5ZcuzWzkyhDUUIwp6Nx+21ncoL0Hsk fbCrU3Vm2fjHuh66WeLaRdnldEa9JpY= X-Received: by 10.25.171.2 with SMTP id u2mr3854233lfe.251.1511212912691; Mon, 20 Nov 2017 13:21:52 -0800 (PST) Received: from beaming.home (91-157-170-157.elisa-laajakaista.fi. [91.157.170.157]) by smtp.gmail.com with ESMTPSA id v63sm1645409lje.39.2017.11.20.13.21.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 20 Nov 2017 13:21:51 -0800 (PST) From: riku.voipio@linaro.org To: qemu-devel@nongnu.org Date: Mon, 20 Nov 2017 23:21:33 +0200 Message-Id: X-Mailer: git-send-email 2.14.2 In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::241 Subject: [Qemu-devel] [PULL 05/15] 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 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> Signed-off-by: Riku Voipio --- 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)