From nobody Wed Mar 01 11:08:01 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PRWg52Sqjz3vkH8; Wed, 1 Mar 2023 11:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PRWg521G6z4Qxd; Wed, 1 Mar 2023 11:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f854+CjMPmn9ZiR5KbUeCLGfjL/jZmAguvSJxoZe85o=; b=Jv0omQhzMm3Na3YH56rG/vRqLgqYlP5VNMCZFQZtFHsjy0quTjGAUT3MYIH3P4bdpha+mz sx/o8N6P0xWE0SG+xoKNvit48hbSh0ZWaW8mhxv09zGTcFpeUCxZw32cCzN7NBu2R6AKhd PrwvS1Qtfpo7bl5jQMLcy2rq+f8ZqoGfHG4qHhsR6ezoAEID/SbkALboyyUKNjWouDiB62 UZjfXUWuEeI791i7PHZhTPrs3r8OgNOKiTywVcffcTIaZ9m+kdsXJuan56THXPCXl9p4nr bZ567X+60vGf5EVERw6VN7q+jXCAqM1zUwvF1Z9SoYA5uhGXvPkDXUrgWaFrvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677668881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=f854+CjMPmn9ZiR5KbUeCLGfjL/jZmAguvSJxoZe85o=; b=ssPtEPBTertS6SMI7EqkOsNpF8xxa9PQy49zmiFSnRj3crcy1S3ilaHnY6/BFdoRG3JwM+ pQv+BgFsLENJhqoyT/7rUcjC/V7uiiYfciqNq2q9w8FpG/YmdHBnKzryvryRwbBJigsEeF LupC84daHDAQRpvH5nNe0r6z0K6pz15gF9is75mGdSiz68osDbTeWvSyDpLu9yp4bCpk84 jz/XLAF8gNCazEYlFwzTRjGiBbTSLonXZ879Dzou9GGAsfiby81aWIiQ6o7lPZDJnyb1js AZuaK0FkkQmWA6ePckY7mKwayI+1ycvNu7oQkARLPcpPph/OZp0V0BSU+KGvNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677668881; a=rsa-sha256; cv=none; b=ydUUUwUADEKW9UDLDN8o51TqWd6YLP2VimCiQXZN35SuV3sfmwSDWriRlhDyggZABEGRGn E3qcbige9TN00qgcmHfDhbVnsltsAyNDCMfDHU5xzzJSgR79ACdBk8t2J/fe8TZnUrmuoh FhgAp5KR08/Zx0nYICHgLAAvVgtsHfn4CLrXRmuVCr+NkZuxspUsGO67LJAc663K+6eAkj bul/0DhPYAUqnTldMa6i+WjldLzEXw5VjsLEqQQgXJK53zUwsBgGeTw06gG8sXA4UKKPy0 UR/MilhCW9Tq3smFZOprFCt0cgRdJf6bPCryTgOS+JjEDgLNGG0UDNt/X7Nv0w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PRWg514wszWmX; Wed, 1 Mar 2023 11:08:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 321B81au061344; Wed, 1 Mar 2023 11:08:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 321B815d061343; Wed, 1 Mar 2023 11:08:01 GMT (envelope-from git) Date: Wed, 1 Mar 2023 11:08:01 GMT Message-Id: <202303011108.321B815d061343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 33755776313e - main - net: whack __mips__ leftovers List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33755776313e4ebb83da6a742616017d9c946838 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=33755776313e4ebb83da6a742616017d9c946838 commit 33755776313e4ebb83da6a742616017d9c946838 Author: Mateusz Guzik AuthorDate: 2023-03-01 11:07:32 +0000 Commit: Mateusz Guzik CommitDate: 2023-03-01 11:07:32 +0000 net: whack __mips__ leftovers Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/bpf.c | 2 +- sys/net/mp_ring.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/bpf.c b/sys/net/bpf.c index 43eed04375d7..3e4521bb28de 100644 --- a/sys/net/bpf.c +++ b/sys/net/bpf.c @@ -1646,7 +1646,7 @@ bpfioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flags, #endif { struct timeval *tv = (struct timeval *)addr; -#if defined(COMPAT_FREEBSD32) && !defined(__mips__) +#if defined(COMPAT_FREEBSD32) struct timeval32 *tv32; struct timeval tv64; diff --git a/sys/net/mp_ring.h b/sys/net/mp_ring.h index 6dea325dc435..7a166b89233d 100644 --- a/sys/net/mp_ring.h +++ b/sys/net/mp_ring.h @@ -40,7 +40,7 @@ typedef u_int (*mp_ring_drain_t)(struct ifmp_ring *, u_int, u_int); typedef u_int (*mp_ring_can_drain_t)(struct ifmp_ring *); typedef void (*mp_ring_serial_t)(struct ifmp_ring *); -#if defined(__powerpc__) || defined(__mips__) || defined(__i386__) +#if defined(__powerpc__) || defined(__i386__) #define MP_RING_NO_64BIT_ATOMICS #endif