From nobody Mon Oct 17 20:32:15 2022 X-Original-To: dev-commits-src-all@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 4MrpZS19Sdz4fPhM; Mon, 17 Oct 2022 20:32:16 +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 4MrpZS0lBsz44R5; Mon, 17 Oct 2022 20:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666038736; 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=ABkVZJ05FYS21zAzpHHuI49sGf3+35aoFz/qn/POlH0=; b=JEl9owv4oNivy4OI+YgmWBaJbiSbnD5SeKgdTOBE8Ckbfnqc7VIy+Edjg+TXGrJP8uUp1L A94MyumH0cNAc9M3N86MrriFmPdH6F0iX6awpLgYXx7c7f0yMlDSKtsPqBa5CgVv47A5pI EPqad7njxfBHPyROEn+d59rZNmBLcxXxdQuvHfXtXSt0CgK6C9uWpnNOxZfFj5jU90DdxM a4ckHSUxRA0Gcasu7AjSXqcJgk/fZFJ5hil55kIVkGS6mcxjm8YL0j9/dNCHNRq4WizSXe YCSzgr+m9n8iPNNBNEbwCvKzAiO8HcazDMR0GgnSLO6u8tj1Oph1t2ODqJmt/g== 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 4MrpZR6wKSzxJB; Mon, 17 Oct 2022 20:32:15 +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 29HKWF71084820; Mon, 17 Oct 2022 20:32:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29HKWFCO084819; Mon, 17 Oct 2022 20:32:15 GMT (envelope-from git) Date: Mon, 17 Oct 2022 20:32:15 GMT Message-Id: <202210172032.29HKWFCO084819@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 9f6097d6a691 - main - linuxkpi: retire now-unused MIPS support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9f6097d6a691d67df463b32193218cb9d09ce02b Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666038736; 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=ABkVZJ05FYS21zAzpHHuI49sGf3+35aoFz/qn/POlH0=; b=wiQ6UFgs73Tj6H+MOYwxTc56HHJr3/GReH0cf3iv8sTc8HbT0DQT3oDo2KHvajx73MJCV1 EI2iqIZf4Qttr4KKwhFlPuEMN4LkFBPLEivyI1f10hoPODihB5zNgRxYL1yF+YNgbsehKs pUqgMtU90V5ae6wx54rkmpc2JAESjNsyc+Aepu9vrdwNXQdJnwXlC6xe5UldF0bcFPD/k5 /gemJW+BGTchMdaH1EfI+XdHzGUvWOAejDhAFJrG1YYzSsYXu2gx5m+dezIzhKBNAqgkZT g1HkNL+TTro/aBlkFHmvBkLfSa8P9fNMvhRBAEetXm3eLVSzvv/eNe3HXERY2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666038736; a=rsa-sha256; cv=none; b=cFOvHrrXWge07+nBdyqrzEVTLENVuftq+Tw1SLtJnI6lw4yfFJjY2qk2pe1ZcmmBuwf/W2 vtLps5QynoxjgsIYkHl5XRKSNtiR/BERvWo5D3ydY28K5WCcJKXuhnHfW3Sw86BF79fZl4 iysC8vc9UAuTfWaHo7SoIuULkydw+f/2CRJo6N4techk5XXgdr3iRWUMu9x+wJ1ecVTskw TFYPJK6iPLlKIFJWWD0lI8L+kU9XNbtFlCVpw/rMfnRbreFK8Mg/6OH2BhYa3D8QfRYqmb umDLJ4vWOFNRkvnnJzzTtBXLnZzqn1Nhjfn0wc8QrbKeI38RK8cRNmzBz2eivw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=9f6097d6a691d67df463b32193218cb9d09ce02b commit 9f6097d6a691d67df463b32193218cb9d09ce02b Author: Ed Maste AuthorDate: 2022-10-17 18:36:09 +0000 Commit: Ed Maste CommitDate: 2022-10-17 20:31:20 +0000 linuxkpi: retire now-unused MIPS support Reviewed by: bz, manu Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37023 --- sys/compat/linuxkpi/common/include/asm/atomic.h | 4 +--- sys/compat/linuxkpi/common/include/asm/atomic64.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/asm/atomic.h b/sys/compat/linuxkpi/common/include/asm/atomic.h index d7e5338c0356..b4154274f3f8 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic.h @@ -166,9 +166,7 @@ atomic_cmpxchg(atomic_t *v, int old, int new) #define LINUXKPI_ATOMIC_16(...) #endif -#if !(defined(i386) || (defined(__mips__) && !(defined(__mips_n32) || \ - defined(__mips_n64))) || (defined(__powerpc__) && \ - !defined(__powerpc64__))) +#if !(defined(i386) || (defined(__powerpc__) && !defined(__powerpc64__))) #define LINUXKPI_ATOMIC_64(...) __VA_ARGS__ #else #define LINUXKPI_ATOMIC_64(...) diff --git a/sys/compat/linuxkpi/common/include/asm/atomic64.h b/sys/compat/linuxkpi/common/include/asm/atomic64.h index 4ee0fa5ecf84..0d9634206a01 100644 --- a/sys/compat/linuxkpi/common/include/asm/atomic64.h +++ b/sys/compat/linuxkpi/common/include/asm/atomic64.h @@ -125,8 +125,7 @@ atomic64_fetch_add_unless(atomic64_t *v, int64_t a, int64_t u) static inline int64_t atomic64_xchg(atomic64_t *v, int64_t i) { -#if !((defined(__mips__) && !(defined(__mips_n32) || defined(__mips_n64))) || \ - (defined(__powerpc__) && !defined(__powerpc64__))) +#if !(defined(__powerpc__) && !defined(__powerpc64__)) return (atomic_swap_64(&v->counter, i)); #else int64_t ret = atomic64_read(v);