From owner-svn-src-all@freebsd.org Wed Jan 22 05:48:01 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0AB1B22D7C7; Wed, 22 Jan 2020 05:48:01 +0000 (UTC) (envelope-from glebius@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 482ZFD6YsBz4ZG5; Wed, 22 Jan 2020 05:48:00 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C3C5920BE3; Wed, 22 Jan 2020 05:48:00 +0000 (UTC) (envelope-from glebius@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00M5m08K017923; Wed, 22 Jan 2020 05:48:00 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00M5m0hm017918; Wed, 22 Jan 2020 05:48:00 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <202001220548.00M5m0hm017918@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 22 Jan 2020 05:48:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356973 - in head: . share/man/man9 sys/sys X-SVN-Group: head X-SVN-Commit-Author: glebius X-SVN-Commit-Paths: in head: . share/man/man9 sys/sys X-SVN-Commit-Revision: 356973 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jan 2020 05:48:01 -0000 Author: glebius Date: Wed Jan 22 05:47:59 2020 New Revision: 356973 URL: https://svnweb.freebsd.org/changeset/base/356973 Log: Remove struct callout_handle. Should have gone with r355732. Modified: head/ObsoleteFiles.inc head/share/man/man9/Makefile head/share/man/man9/callout.9 head/sys/sys/callout.h Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Jan 22 05:32:23 2020 (r356972) +++ head/ObsoleteFiles.inc Wed Jan 22 05:47:59 2020 (r356973) @@ -282,6 +282,7 @@ OLD_DIRS+=usr/lib/clang/9.0.0 # 20191214: Removal of sranddev(3) OLD_FILES+=usr/share/man/man3/sranddev.3.gz # 20191213: remove timeout(9) +OLD_FILES+=usr/share/man/man9/callout_handle_init.9.gz OLD_FILES+=usr/share/man/man9/timeout.9.gz OLD_FILES+=usr/share/man/man9/untimeout.9.gz # 20191128: Removal of trm(4) Modified: head/share/man/man9/Makefile ============================================================================== --- head/share/man/man9/Makefile Wed Jan 22 05:32:23 2020 (r356972) +++ head/share/man/man9/Makefile Wed Jan 22 05:47:59 2020 (r356973) @@ -770,7 +770,6 @@ MLINKS+=callout.9 callout_active.9 \ callout.9 callout_async_drain.9 \ callout.9 callout_deactivate.9 \ callout.9 callout_drain.9 \ - callout.9 callout_handle_init.9 \ callout.9 callout_init.9 \ callout.9 callout_init_mtx.9 \ callout.9 callout_init_rm.9 \ Modified: head/share/man/man9/callout.9 ============================================================================== --- head/share/man/man9/callout.9 Wed Jan 22 05:32:23 2020 (r356972) +++ head/share/man/man9/callout.9 Wed Jan 22 05:47:59 2020 (r356973) @@ -37,7 +37,6 @@ .Nm callout_deactivate , .Nm callout_async_drain , .Nm callout_drain , -.Nm callout_handle_init , .Nm callout_init , .Nm callout_init_mtx , .Nm callout_init_rm , @@ -72,11 +71,6 @@ typedef void callout_func_t (void *); .Fn callout_async_drain "struct callout *c" "callout_func_t *drain" .Ft int .Fn callout_drain "struct callout *c" -.Ft void -.Fn callout_handle_init "struct callout_handle *handle" -.Bd -literal -struct callout_handle handle = CALLOUT_HANDLE_INITIALIZER(&handle); -.Ed .Ft void .Fn callout_init "struct callout *c" "int mpsafe" .Ft void Modified: head/sys/sys/callout.h ============================================================================== --- head/sys/sys/callout.h Wed Jan 22 05:32:23 2020 (r356972) +++ head/sys/sys/callout.h Wed Jan 22 05:47:59 2020 (r356973) @@ -62,10 +62,6 @@ #define C_PRECALC 0x0400 /* event time is pre-calculated. */ #define C_CATCH 0x0800 /* catch signals, used by pause_sbt(9) */ -struct callout_handle { - struct callout *callout; -}; - /* Flags for callout_stop_safe() */ #define CS_DRAIN 0x0001 /* callout_drain(), wait allowed */ #define CS_EXECUTING 0x0002 /* Positive return value indicates that