From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C74F2C433EF for ; Mon, 18 Oct 2021 19:03:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5A38C61283 for ; Mon, 18 Oct 2021 19:03:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 5A38C61283 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=bsdimp.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:52028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcXvR-0002R2-E4 for qemu-devel@archiver.kernel.org; Mon, 18 Oct 2021 15:03:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43330) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcXtG-0007x4-Fz for qemu-devel@nongnu.org; Mon, 18 Oct 2021 15:01:42 -0400 Received: from mail-io1-xd2c.google.com ([2607:f8b0:4864:20::d2c]:42868) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mcXtC-0001WY-Jf for qemu-devel@nongnu.org; Mon, 18 Oct 2021 15:01:42 -0400 Received: by mail-io1-xd2c.google.com with SMTP id z69so14381848iof.9 for ; Mon, 18 Oct 2021 12:01:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PY6MV6MerQjsFge0//XqvVk7s3rubPiFJX6U1DaTO60=; b=uwYzOWik1tmM5QEz2va0KD+1AA8NNuZ6VgZs2PmiwnsjQ/K7uxTzNv3jbbzxBmkfWU 9QRjrI9+h01EKFdKbOQsewrLWz6kKgEw+svW7flXNd8U2T3Ld5G6ZieY7GsTXuk4HDv5 IvafB4NfPc6a2Q0BmeuVB5vuYjRtHMRK8h0EzoiQdFmnSLSq038Q5O/U5cakjUolcTtf hSGVFV0EvJOFYBb3yq4KmPmj5ZLgfPgkytYMMxONP08M44fo0cuubWH+h02StAC+G+XU wTCgF1GFhdvJ4IqZLTasEKSb3rWfxvP9V8bB8MWefgIIH354vGuLMd0/Msk/A3UuUKza KjcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PY6MV6MerQjsFge0//XqvVk7s3rubPiFJX6U1DaTO60=; b=uv0BYIBFPBtIODZkvTXO33N1kykBlm4U7c6ZzI4qEMi3zal+SMxQ2Wx6Z8sfOIzIEA H2dpXEGX0rqPitc+14CWHUGU9+C5W7pTtGkMnZ5VLIq1K7ZzKvr7giFGljGGtCJn7HSu gr1DvVaPmUqDj0UvZQreevd0rDlnVzhAJUEGXdV+tMQ8hIjEuplLdBANBxkXhHlpOqQL VTyuDCXZVLKdNoGCX+rgGWJFe0q864Sgf9jmwb7c0myNoFdEUiO29DAxh5C05lBx9JFm KqusIeasEZ8xTmufbNkd8ZqNfEakegDm92MkJWkMLZY2mBQObOKuHR5Gf1Fe96ne2FoO wHOA== X-Gm-Message-State: AOAM530kO45K9gdQ2U/0rwNvnSda9tL2EUph9mInSYQKPw5xFNNxqmcB QL9HyfF/J53pUjqogl21AydNkskNbs0= X-Google-Smtp-Source: ABdhPJwEQtUKGXvFNk8fNui4/x6gxxjD3ui3cH+6NeB0ZNNhw8dVWqdtp85uZS0Eb0LTa5asV4wBmA== X-Received: by 2002:a05:6638:2484:: with SMTP id x4mr1097031jat.79.1634583697350; Mon, 18 Oct 2021 12:01:37 -0700 (PDT) Received: from dune.bsdimp.com (50-253-99-174-static.hfc.comcastbusiness.net. [50.253.99.174]) by smtp.gmail.com with ESMTPSA id a8sm6945151ilh.5.2021.10.18.12.01.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Oct 2021 12:01:36 -0700 (PDT) From: Warner Losh To: qemu-devel@nongnu.org Subject: [PULL v2 03/23] bsd-user/mmap.c: MAP_ symbols are defined, so no need for ifdefs Date: Mon, 18 Oct 2021 13:00:55 -0600 Message-Id: <20211018190115.5365-4-imp@bsdimp.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211018190115.5365-1-imp@bsdimp.com> References: <20211018190115.5365-1-imp@bsdimp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: none client-ip=2607:f8b0:4864:20::d2c; envelope-from=imp@bsdimp.com; helo=mail-io1-xd2c.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kyle Evans , Richard Henderson , Laurent Vivier , Warner Losh , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" All these MAP_ symbols are always defined on supported FreeBSD versions (12.2 and newer), so remove the #ifdefs since they aren't needed. Signed-off-by: Warner Losh Reviewed-by: Philippe Mathieu-Daudé Acked-by: Richard Henderson Reviewed-by: Kyle Evans --- bsd-user/mmap.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c index 4f4fa3ab46..6f33aec58b 100644 --- a/bsd-user/mmap.c +++ b/bsd-user/mmap.c @@ -286,13 +286,9 @@ static abi_ulong mmap_find_vma_aligned(abi_ulong start, abi_ulong size, wrapped = repeat = 0; prev = 0; flags = MAP_ANONYMOUS | MAP_PRIVATE; -#ifdef MAP_ALIGNED if (alignment != 0) { flags |= MAP_ALIGNED(alignment); } -#else - /* XXX TODO */ -#endif for (;; prev = ptr) { /* @@ -407,22 +403,18 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, printf("MAP_ALIGNED(%u) ", (flags & MAP_ALIGNMENT_MASK) >> MAP_ALIGNMENT_SHIFT); } -#if MAP_GUARD if (flags & MAP_GUARD) { printf("MAP_GUARD "); } -#endif if (flags & MAP_FIXED) { printf("MAP_FIXED "); } if (flags & MAP_ANONYMOUS) { printf("MAP_ANON "); } -#ifdef MAP_EXCL if (flags & MAP_EXCL) { printf("MAP_EXCL "); } -#endif if (flags & MAP_PRIVATE) { printf("MAP_PRIVATE "); } @@ -432,11 +424,9 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, if (flags & MAP_NOCORE) { printf("MAP_NOCORE "); } -#ifdef MAP_STACK if (flags & MAP_STACK) { printf("MAP_STACK "); } -#endif printf("fd=%d offset=0x%llx\n", fd, offset); } #endif @@ -445,7 +435,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, errno = EINVAL; goto fail; } -#ifdef MAP_STACK if (flags & MAP_STACK) { if ((fd != -1) || ((prot & (PROT_READ | PROT_WRITE)) != (PROT_READ | PROT_WRITE))) { @@ -453,8 +442,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, goto fail; } } -#endif /* MAP_STACK */ -#ifdef MAP_GUARD if ((flags & MAP_GUARD) && (prot != PROT_NONE || fd != -1 || offset != 0 || (flags & (MAP_SHARED | MAP_PRIVATE | /* MAP_PREFAULT | */ /* MAP_PREFAULT not in mman.h */ @@ -462,7 +449,6 @@ abi_long target_mmap(abi_ulong start, abi_ulong len, int prot, errno = EINVAL; goto fail; } -#endif if (offset & ~TARGET_PAGE_MASK) { errno = EINVAL; -- 2.32.0