From nobody Sun Dec 5 15:13:23 2021 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 0BE6318BEAF8; Sun, 5 Dec 2021 15:13:24 +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 4J6VSM4MNhz3lrk; Sun, 5 Dec 2021 15:13:23 +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 769EE1A2D3; Sun, 5 Dec 2021 15:13:23 +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 1B5FDN3u049556; Sun, 5 Dec 2021 15:13:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B5FDNnG049555; Sun, 5 Dec 2021 15:13:23 GMT (envelope-from git) Date: Sun, 5 Dec 2021 15:13:23 GMT Message-Id: <202112051513.1B5FDNnG049555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mitchell Horne Subject: git: 03b3d7bbec99 - main - x86: remove unused T_USER flag 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: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 03b3d7bbec99742910e2d0d5e7c23754eca9b2c4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638717203; 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=fn3gTlBbS0RsfYWbw+L4efbGvvljNXVXidB8s26vUBw=; b=qhKPP8RpBDj8AtojWOv/jYcZ4sHKqRMbEaf1nXuVJErjZlH5gaTJ9nBcduAJVJazyTfZRF J9nnFHq/cfBSUj4liiFtRJiVGwVs9zAnkqdiNYjZDiPo0J27g9KY7lK+Xi+1JlN3eK2/Wk ebJa2lQDjG6F6O76/qibBZUl9lyNtzixZSr0iel6b4OBYGk3RAfyOIu1cc0lEuwbyuLi9z pvqVdPQ0Y6POBOGO7ZnWM0/ZVrXlMZDkiDAcnCLUY3JmjgXuDYcvjB55KSX/SIzZMzhlpd 35hM8yMbFmZyxNSTNGFF8tdpJrD/j0gKoVYCjGbAVBBCXqF0hQ1yF33gcXfw8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638717203; a=rsa-sha256; cv=none; b=oN/IH96kBYtPdcOvE0kGeHprjI5cYDbnFNKjdM8OgA8Byif1qE0CDLzpWk2gnt5gj9LM0I tzVHWdS5E84gE2vvJGqjfMP8lGxPWfgiY6j7V/ls5msfptxfhthJhvWh9zwBuJziZFa997 /Gw0d7yY8qrzSqkodtpHbyvL+Hxw+3fC34dtx/5P1chaJxgT51uvygmPnT0KOmbvma08ly kb6vBJjoTBmfMrL9enOv5QHtHhAFxgnsgVzmannDKVuKwZE8mRZxzaBfnTx6FGTq/LdEyY 1zF8IAq3+tJ1GjgJ1KIP9aOgy4acnn5rJGEbM9DhpLzWic3L2JkHQp5axcoU8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=03b3d7bbec99742910e2d0d5e7c23754eca9b2c4 commit 03b3d7bbec99742910e2d0d5e7c23754eca9b2c4 Author: Mitchell Horne AuthorDate: 2021-12-05 15:11:55 +0000 Commit: Mitchell Horne CommitDate: 2021-12-05 15:12:40 +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 --- 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 b5acce216fe6..02b76a35d7ae 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 766f38f181f8..7523787da536 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_ */