From nobody Fri Dec 10 18:31:41 2021 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 EFCD118D3350; Fri, 10 Dec 2021 18:31:41 +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 4J9fcs4sRBz3w2C; Fri, 10 Dec 2021 18:31:41 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7C13A1F46D; Fri, 10 Dec 2021 18:31:41 +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 1BAIVfxP048289; Fri, 10 Dec 2021 18:31:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BAIVftH048288; Fri, 10 Dec 2021 18:31:41 GMT (envelope-from git) Date: Fri, 10 Dec 2021 18:31:41 GMT Message-Id: <202112101831.1BAIVftH048288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 8e0b69973086 - stable/13 - x86: remove unused T_USER flag 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8e0b69973086aab8d1009b67c57d141300bfd39e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639161101; 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=1ahDhub5U/d2PLmdrRQCj/pJUsw/31RFl4hT59sbBqE=; b=pInuG+lijh8lMznoSg3UbEuWIdQLvmDgB3lPXqF+Lex+O7ZBnrABe3u94yY6d7W6KYjtol sbplkzeYoHsCGZeI2anIzbbN7xBaDwvbYxcQVVFR9rMzME/kF150QpiilmzGIlGGOqF4HJ 9G5IR7jyaFC22ePRDYru+zRHmoGw8ilLRjZko6OUjuhlL/jxrOEt2vu4RzRRNJBo3zov79 50ruLQvj1PJQQaP4F0wkxh4HSaxbIbg5FFVrbEa5YKFesnzVS+j3DbmT+iARnbvQo4NsrX oTdzLCDTGWSYR5gl5XNx2+4lLJ4NbPmgOxKoWpVZn5njCMvfum2V91FEMdEsBw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639161101; a=rsa-sha256; cv=none; b=cGq6K9jLghf949BJSUnKSTmM6yOkFc6nLrGpAVfxc1rKlVs6Xy/q2z/NgUEHy9YkzYBtQx 4IawuY8H45BE6sRI/JIifijCgJzhiO4IZTfV0rCfNhkDZw1mcciFnX4Adx0vAKaoflJemg t2U96NB8yt+S5+AqP56TAGUMvK/rHe6UhtDvzeaTWPQNg5aKfIksHDFPrSwN9YffkpJ1s/ bhcQgS6rb2D8PpS1cjAapZpjomCwW3SPyHoRsRdGCLVU2vtqt3prTbQuJEb6kyM0uNLieM t8LJPJuFQ6U99Hi07Dv1da+7VCewDcyqPwFlvP2YlCVmNjo4aZ9ZBqkedV2MBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=8e0b69973086aab8d1009b67c57d141300bfd39e commit 8e0b69973086aab8d1009b67c57d141300bfd39e Author: Mitchell Horne AuthorDate: 2021-12-05 15:11:55 +0000 Commit: Mitchell Horne CommitDate: 2021-12-10 18:31:20 +0000 x86: remove unused T_USER flag It stopped being used in 3c256f5395aa, when trap() was reorganized to have separate switch statements for user and kernel traps. Remove the two leftover references and the flag itself. Reviewed by: kib MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D33253 (cherry picked from commit 03b3d7bbec99742910e2d0d5e7c23754eca9b2c4) --- sys/amd64/amd64/gdb_machdep.c | 2 +- sys/i386/i386/gdb_machdep.c | 2 +- sys/x86/include/trap.h | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/amd64/amd64/gdb_machdep.c b/sys/amd64/amd64/gdb_machdep.c index 176c770a3731..eb5ab525aa9c 100644 --- a/sys/amd64/amd64/gdb_machdep.c +++ b/sys/amd64/amd64/gdb_machdep.c @@ -136,7 +136,7 @@ int gdb_cpu_signal(int type, int code) { - switch (type & ~T_USER) { + switch (type) { case T_BPTFLT: return (SIGTRAP); case T_ARITHTRAP: return (SIGFPE); case T_PROTFLT: return (SIGSEGV); diff --git a/sys/i386/i386/gdb_machdep.c b/sys/i386/i386/gdb_machdep.c index 549c6de7ba1b..7cb83d839fec 100644 --- a/sys/i386/i386/gdb_machdep.c +++ b/sys/i386/i386/gdb_machdep.c @@ -100,7 +100,7 @@ int gdb_cpu_signal(int type, int code) { - switch (type & ~T_USER) { + switch (type) { case T_BPTFLT: return (SIGTRAP); case T_ARITHTRAP: return (SIGFPE); case T_PROTFLT: return (SIGSEGV); diff --git a/sys/x86/include/trap.h b/sys/x86/include/trap.h index 74c4522c02a8..c31e454cd05f 100644 --- a/sys/x86/include/trap.h +++ b/sys/x86/include/trap.h @@ -66,7 +66,4 @@ #define T_RESERVED 30 /* reserved (unknown) */ #define T_DTRACE_RET 32 /* DTrace pid return */ -/* Trap's coming from user mode */ -#define T_USER 0x100 - #endif /* !_MACHINE_TRAP_H_ */