From nobody Wed May 08 13:07:47 2024 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 4VZFmz3p3Yz5J5wH; Wed, 08 May 2024 13:07:47 +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 4VZFmz1B2Kz4RKV; Wed, 8 May 2024 13:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715173667; 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=3bbXswtIV06Ztoo3qgTmQSwDk5s+XZ/3agEvimRMLSw=; b=rMokJxxvs2chwtr+eVwQW/ibxDC0xvLYaitUgRJacw6mW8pjYlRFHYf+A9hdF7AXhi1/dp p6FZpbUbv7NsTD1fPP7MaTpPv3P4wt6FGy/iXpfgDl0l56A3SB1TZ2S0fKBFnBziK+0QhX mhRrfvHNr+/yjbac8IcggW9qr5kh43MHAqA+fUqfc6KU0faPJMmnvn7DPcv9RCPlaVrlgg zL3KjqS+09uXw1ETiRDWfnbK0OKi9IkfzdOrbt6TFkGHF34v8DaIwtJU/a4DMxvHgEBdcR Twhzoqk74P5Equxww92Fgpgz4uUzm1N4928r/H2amPbqnaDsIt3nWNHOJ1clFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715173667; a=rsa-sha256; cv=none; b=PDkA4N2NdZBibv4p/CAsOeClkEb4Vz1jnOCqIbGoq3LKqGaLCztnU6r5GJ1u4L/+WdE2qd qeyXsp5FfecqqpZfsNWR+kIoauzn/NPtjHqyT+WhKQhir19OXLVbKNPBOvvdokD+ArBwLb qjQl41AcELj0E4ruc7fw7g2wyymg85BFSPbqGyRG2lLb2PtUTNsysdAQxnSm4KXnj+9qCb inXq4FNnK4l+TrRdNyeyqv/qa4bYs1FAZPKunVm0v3PFiA35cjWvhan5yGY750Z9z2+sdw ewD2T/GnKH+hhRsYkZ+Qiplf3tGjIiC5rL/BsPAwTSX+sVW4aj28WLgd0OFqaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715173667; 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=3bbXswtIV06Ztoo3qgTmQSwDk5s+XZ/3agEvimRMLSw=; b=e2qSJiS2SvTA8qVPZDOKikhjQafuf66tRm/SVfSDuveDgSYJKOy1AaJm8n8trmAxRctY2I FKf5Mct54IatOVCCjgaJdQkCKaznQrPaPIn3RFcBqcmQ9k8+XM6rgg17xYo0q2XkBnVuQo +iGn+KefXMKWl7ncjlsTRkKLoLs5SAtxt8wQPeqDyXqnEzAWOPWgjCp/LEGQVpLg93R42M OKmDMjE3jjENbuD7gROgO7jWE+FeQsWLVfj1N3uiUBv0jtysbAiGw6+hM4bq0qwSt6mArI cIHCj0Gvze2PsXeBfcgvLwRUhvxupydIrtp0QqBqzo9CByzWwIu5PhMBkmFfbQ== 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 4VZFmz0nKZzQYN; Wed, 8 May 2024 13:07:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 448D7li7080389; Wed, 8 May 2024 13:07:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 448D7lV8080386; Wed, 8 May 2024 13:07:47 GMT (envelope-from git) Date: Wed, 8 May 2024 13:07:47 GMT Message-Id: <202405081307.448D7lV8080386@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 95cb70275609 - stable/14 - arm: Remove duplicate definitions in armreg.h 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 95cb7027560939cc2f78dcf9230abba42707d3a7 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=95cb7027560939cc2f78dcf9230abba42707d3a7 commit 95cb7027560939cc2f78dcf9230abba42707d3a7 Author: Mark Johnston AuthorDate: 2024-04-30 20:31:11 +0000 Commit: Mark Johnston CommitDate: 2024-05-08 13:06:16 +0000 arm: Remove duplicate definitions in armreg.h No functional change intended. MFC after: 1 week (cherry picked from commit 4a5e2ddbd8943baf7add831ab835594ac60f94d1) --- sys/arm/include/armreg.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm/include/armreg.h b/sys/arm/include/armreg.h index 8beef9b31022..819355111909 100644 --- a/sys/arm/include/armreg.h +++ b/sys/arm/include/armreg.h @@ -41,8 +41,6 @@ #ifndef MACHINE_ARMREG_H #define MACHINE_ARMREG_H -#define INSN_SIZE 4 -#define INSN_COND_MASK 0xf0000000 /* Condition mask */ #define PSR_MODE 0x0000001f /* mode mask */ #define PSR_USR32_MODE 0x00000010 #define PSR_FIQ32_MODE 0x00000011