From nobody Tue Aug 02 18:12:19 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 4Ly3442fVtz4XqmY; Tue, 2 Aug 2022 18:12:20 +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 4Ly3436lsqz40k5; Tue, 2 Aug 2022 18:12:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659463940; 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=5qFaCdjWEWpJwOZgOILtyHMnrQ1BzF3D+rE4dU9ZzPc=; b=M4jnptWF6g0c7YJK8ZzeOq9V7VZVhBVj/rs/zanx9FOW7159Sj9HRy6cO2vAD7jEcFKUGu 2eL62nVZ+2Xno+uCF+tvu2gjPC01y00jDoAp1qlumwXwFBMoU9yNG1KvoJKU4BFB1AvFUF nFqWeKIKKQr04QlQ9Hmurl1VxLc/GD4Dwqy9Ognkx7Lc4Q7yNMPEK4v/zPGHj7MKg1Hssg gYMmzH44OJzfozBB1z1r8IvT7dglug+2beCh0zbe9MBfJqqefJD+ASfL3lX4CFr7/lET4+ KMSr649HEO/NyAhMes68waDqswMD5fawshR0tdH1LItXy8xMZiz/fbdE3eMMWQ== 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 4Ly3435qy5zMgR; Tue, 2 Aug 2022 18:12:19 +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 272ICJ2o000597; Tue, 2 Aug 2022 18:12:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 272ICJYa000596; Tue, 2 Aug 2022 18:12:19 GMT (envelope-from git) Date: Tue, 2 Aug 2022 18:12:19 GMT Message-Id: <202208021812.272ICJYa000596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c46771a7b736 - main - kern/subr_trap.c: cleanup no longer needed headers 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c46771a7b736170aa1ed8fbd327f3b560db93e88 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659463940; 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=5qFaCdjWEWpJwOZgOILtyHMnrQ1BzF3D+rE4dU9ZzPc=; b=CzriOxD/Y+WWP+hEeX3B2E0kTSouBOdGfMgbKoSCjyWf8EBo1tEb44/TLFydsR/GbtmELs M9WSnLuGllD/6vb4PB7pkG2T8BXdjFE98e1rxSwTTKYQ41NC6yI5TaOvQFx4v1k3R+bXhN GaGvuejF3bhQnKzhoPEAihOzFRL37Ni+RGopA0X1vPI9lntece7fBGY9VBQhdAOJJ8XJBv AOMKfgQnAhRuyOm4fTFIWZbjEPCKDDBsORwvubG+V3PUmD4BcUowtrakPCCl5iZmYNN5pZ SkU5wx2rLFzf+bEORB84iCIa2e9ibk88+bZuD0t8Tz7jnFsC7csorOJzQEYMog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659463940; a=rsa-sha256; cv=none; b=rIKCRZRuIa+ZZ7TXsCEzfrduMWXXc8MqJeOh1jF+mLxZGgUslM48bAP8dKN+GfmuDFgoNb 8P62N/pgHyoRZAXauV3Tf2X7Qteyja82XE2B5Hrunl3AOgvA6KRN4fw7ryo/hAynSiQzho aa2wmZoUo684C8WEXg7a6okLvoDG/Ji0oJexW7GxykF2090UepSweheUvevEfMzRA5IS+q ih4Hf3fCobhWcP2ea+EsTHQgYcLRW1PNA6s92pqCr8yBHGPPXkEDQiTsU/Oh5H434FVJqV hkDFXj8LCsfHvoUyQyx9LIWm2CFpyD+k3BVvhJzNguorAQz91Cn9gtEHx918jA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c46771a7b736170aa1ed8fbd327f3b560db93e88 commit c46771a7b736170aa1ed8fbd327f3b560db93e88 Author: Konstantin Belousov AuthorDate: 2022-07-25 13:03:59 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-02 18:11:10 +0000 kern/subr_trap.c: cleanup no longer needed headers Also bump Foundation' copyright year Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D35888 --- sys/kern/subr_trap.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 8071b2922f4a..f9976b090771 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -4,7 +4,7 @@ * Copyright (C) 1994, David Greenman * Copyright (c) 1990, 1993 * The Regents of the University of California. All rights reserved. - * Copyright (c) 2007 The FreeBSD Foundation + * Copyright (c) 2007, 2022 The FreeBSD Foundation * * This code is derived from software contributed to Berkeley by * the University of Utah, and William Jolitz. @@ -47,35 +47,22 @@ __FBSDID("$FreeBSD$"); #include "opt_hwpmc_hooks.h" -#include "opt_ktrace.h" -#include "opt_sched.h" #include -#include -#include -#include #include +#include #include #include #include -#include #include #include -#include -#include #include #include -#include #include #include #include #include #include -#ifdef KTRACE -#include -#include -#endif -#include #include @@ -87,7 +74,9 @@ __FBSDID("$FreeBSD$"); #include #endif -#include +#ifdef EPOCH_TRACE +#include +#endif /* * Define the code needed before returning to user mode, for trap and