From owner-svn-src-head@freebsd.org Thu Jan 30 20:05:20 2020 Return-Path: Delivered-To: svn-src-head@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 158A61FCDD1; Thu, 30 Jan 2020 20:05:20 +0000 (UTC) (envelope-from mjg@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 487rtm0NzYz4Zyl; Thu, 30 Jan 2020 20:05:20 +0000 (UTC) (envelope-from mjg@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 E22522512; Thu, 30 Jan 2020 20:05:19 +0000 (UTC) (envelope-from mjg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 00UK5JJn011894; Thu, 30 Jan 2020 20:05:19 GMT (envelope-from mjg@FreeBSD.org) Received: (from mjg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 00UK55YU011830; Thu, 30 Jan 2020 20:05:05 GMT (envelope-from mjg@FreeBSD.org) Message-Id: <202001302005.00UK55YU011830@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mjg set sender to mjg@FreeBSD.org using -f From: Mateusz Guzik Date: Thu, 30 Jan 2020 20:05:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357312 - head/sys/kern X-SVN-Group: head X-SVN-Commit-Author: mjg X-SVN-Commit-Paths: head/sys/kern X-SVN-Commit-Revision: 357312 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jan 2020 20:05:20 -0000 Author: mjg Date: Thu Jan 30 20:05:05 2020 New Revision: 357312 URL: https://svnweb.freebsd.org/changeset/base/357312 Log: Remove duplicated empty lines from kern/*.c No functional changes. Modified: head/sys/kern/imgact_binmisc.c head/sys/kern/imgact_elf.c head/sys/kern/init_main.c head/sys/kern/kern_alq.c head/sys/kern/kern_conf.c head/sys/kern/kern_exit.c head/sys/kern/kern_hhook.c head/sys/kern/kern_jail.c head/sys/kern/kern_kcov.c head/sys/kern/kern_kthread.c head/sys/kern/kern_linker.c head/sys/kern/kern_lockf.c head/sys/kern/kern_mib.c head/sys/kern/kern_mtxpool.c head/sys/kern/kern_pmc.c head/sys/kern/kern_poll.c head/sys/kern/kern_resource.c head/sys/kern/kern_sig.c head/sys/kern/kern_switch.c head/sys/kern/kern_sysctl.c head/sys/kern/kern_tc.c head/sys/kern/kern_time.c head/sys/kern/kern_ubsan.c head/sys/kern/kern_umtx.c head/sys/kern/link_elf.c head/sys/kern/link_elf_obj.c head/sys/kern/sched_4bsd.c head/sys/kern/sched_ule.c head/sys/kern/subr_acl_posix1e.c head/sys/kern/subr_blist.c head/sys/kern/subr_bufring.c head/sys/kern/subr_bus.c head/sys/kern/subr_clock.c head/sys/kern/subr_csan.c head/sys/kern/subr_fattime.c head/sys/kern/subr_filter.c head/sys/kern/subr_gtaskqueue.c head/sys/kern/subr_hints.c head/sys/kern/subr_intr.c head/sys/kern/subr_kdb.c head/sys/kern/subr_sbuf.c head/sys/kern/subr_sleepqueue.c head/sys/kern/subr_smp.c head/sys/kern/subr_stats.c head/sys/kern/subr_unit.c head/sys/kern/subr_vmem.c head/sys/kern/subr_witness.c head/sys/kern/sys_generic.c head/sys/kern/sys_pipe.c head/sys/kern/sys_process.c head/sys/kern/sysv_msg.c head/sys/kern/sysv_shm.c head/sys/kern/uipc_mbuf.c head/sys/kern/uipc_usrreq.c head/sys/kern/vfs_acl.c head/sys/kern/vfs_bio.c head/sys/kern/vfs_cluster.c head/sys/kern/vfs_extattr.c head/sys/kern/vfs_init.c head/sys/kern/vfs_subr.c head/sys/kern/vfs_syscalls.c head/sys/kern/vfs_vnops.c Modified: head/sys/kern/imgact_binmisc.c ============================================================================== --- head/sys/kern/imgact_binmisc.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/imgact_binmisc.c Thu Jan 30 20:05:05 2020 (r357312) @@ -609,7 +609,6 @@ imgact_binmisc_exec(struct image_params *imgp) fname = sbuf_data(sname); } - /* * We need to "push" the interpreter in the arg[] list. To do this, * we first shift all the other values in the `begin_argv' area to @@ -706,7 +705,6 @@ imgact_binmisc_exec(struct image_params *imgp) if (!error) imgp->interpreter_name = imgp->args->begin_argv; - done: if (sname) Modified: head/sys/kern/imgact_elf.c ============================================================================== --- head/sys/kern/imgact_elf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/imgact_elf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -630,7 +630,6 @@ __elfN(load_section)(struct image_params *imgp, vm_oof return (0); } - /* * We have to get the remaining bit of the file into the first part * of the oversized map segment. This is normally because the .data Modified: head/sys/kern/init_main.c ============================================================================== --- head/sys/kern/init_main.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/init_main.c Thu Jan 30 20:05:05 2020 (r357312) @@ -115,7 +115,6 @@ linux_alloc_current_noop(struct thread *td __unused, i } int (*lkpi_alloc_current)(struct thread *, int) = linux_alloc_current_noop; - #ifndef BOOTHOWTO #define BOOTHOWTO 0 #endif Modified: head/sys/kern/kern_alq.c ============================================================================== --- head/sys/kern/kern_alq.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_alq.c Thu Jan 30 20:05:05 2020 (r357312) @@ -120,7 +120,6 @@ static void alq_shutdown(struct alq *); static void alq_destroy(struct alq *); static int alq_doio(struct alq *); - /* * Add a new queue to the global list. Fail if we're shutting down. */ @@ -422,7 +421,6 @@ static struct kproc_desc ald_kp = { SYSINIT(aldthread, SI_SUB_KTHREAD_IDLE, SI_ORDER_ANY, kproc_start, &ald_kp); SYSINIT(ald, SI_SUB_LOCK, SI_ORDER_ANY, ald_startup, NULL); - /* User visible queue functions */ /* @@ -501,7 +499,6 @@ alq_open(struct alq **alqp, const char *file, struct u return (ret); } - /* * Copy a new entry into the queue. If the operation would block either Modified: head/sys/kern/kern_conf.c ============================================================================== --- head/sys/kern/kern_conf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_conf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -950,7 +950,6 @@ dev_dependsl(struct cdev *pdev, struct cdev *cdev) LIST_INSERT_HEAD(&pdev->si_children, cdev, si_siblings); } - void dev_depends(struct cdev *pdev, struct cdev *cdev) { @@ -1324,7 +1323,6 @@ clone_create(struct clonedevs **cdp, struct cdevsw *cs ("Too high unit (0x%x) in clone_create", *up)); KASSERT(csw->d_flags & D_NEEDMINOR, ("clone_create() on cdevsw without minor numbers")); - /* * Search the list for a lot of things in one go: Modified: head/sys/kern/kern_exit.c ============================================================================== --- head/sys/kern/kern_exit.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_exit.c Thu Jan 30 20:05:05 2020 (r357312) @@ -686,7 +686,6 @@ exit1(struct thread *td, int rval, int signo) thread_exit(); } - #ifndef _SYS_SYSPROTO_H_ struct abort2_args { char *why; @@ -762,7 +761,6 @@ out: exit1(td, 0, sig); return (0); } - #ifdef COMPAT_43 /* Modified: head/sys/kern/kern_hhook.c ============================================================================== --- head/sys/kern/kern_hhook.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_hhook.c Thu Jan 30 20:05:05 2020 (r357312) @@ -508,7 +508,6 @@ hhook_vnet_uninit(const void *unused __unused) HHHLIST_UNLOCK(); } - /* * When a vnet is created and being initialised, init the V_hhook_vhead_list. */ Modified: head/sys/kern/kern_jail.c ============================================================================== --- head/sys/kern/kern_jail.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_jail.c Thu Jan 30 20:05:05 2020 (r357312) @@ -436,7 +436,6 @@ kern_jail(struct thread *td, struct jail *j) return (error); } - /* * struct jail_set_args { * struct iovec *iovp; @@ -1896,7 +1895,6 @@ kern_jail_set(struct thread *td, struct uio *optuio, i return (error); } - /* * struct jail_get_args { * struct iovec *iovp; @@ -2208,7 +2206,6 @@ kern_jail_get(struct thread *td, struct uio *optuio, i return (error); } - /* * struct jail_remove_args { * int jid; @@ -2308,7 +2305,6 @@ prison_remove_one(struct prison *pr) prison_deref(pr, deuref | PD_DEREF); } - /* * struct jail_attach_args { * int jid; @@ -2425,7 +2421,6 @@ do_jail_attach(struct thread *td, struct prison *pr) return (error); } - /* * Returns a locked prison instance, or NULL on failure. */ @@ -3426,7 +3421,6 @@ prison_path(struct prison *pr1, struct prison *pr2) return (path2 + len1); return (path2); } - /* * Jail-related sysctls. Modified: head/sys/kern/kern_kcov.c ============================================================================== --- head/sys/kern/kern_kcov.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_kcov.c Thu Jan 30 20:05:05 2020 (r357312) @@ -321,7 +321,6 @@ kcov_close(struct cdev *dev, int fflag, int devtype, s struct kcov_info *info; int error; - if ((error = devfs_get_cdevpriv((void **)&info)) != 0) return (error); Modified: head/sys/kern/kern_kthread.c ============================================================================== --- head/sys/kern/kern_kthread.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_kthread.c Thu Jan 30 20:05:05 2020 (r357312) @@ -230,7 +230,6 @@ kproc_suspend_check(struct proc *p) PROC_UNLOCK(p); } - /* * Start a kernel thread. * Modified: head/sys/kern/kern_linker.c ============================================================================== --- head/sys/kern/kern_linker.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_linker.c Thu Jan 30 20:05:05 2020 (r357312) @@ -133,7 +133,6 @@ retry: \ (a) = next_file_id; \ } while(0) - /* XXX wrong name; we're looking at version provision tags here, not modules */ typedef TAILQ_HEAD(, modlist) modlisthead_t; struct modlist { Modified: head/sys/kern/kern_lockf.c ============================================================================== --- head/sys/kern/kern_lockf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_lockf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -886,7 +886,6 @@ lf_free_edge(struct lockf_edge *e) free(e, M_LOCKF); } - /* * Ensure that the lock's owner has a corresponding vertex in the * owner graph. Modified: head/sys/kern/kern_mib.c ============================================================================== --- head/sys/kern/kern_mib.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_mib.c Thu Jan 30 20:05:05 2020 (r357312) @@ -518,7 +518,6 @@ sysctl_build_id(SYSCTL_HANDLER_ARGS) return (ENOENT); } - hashlen = sectionlen - BUILD_ID_HEADER_LEN; for (int i = 0; i < hashlen; i++) { uint8_t c = __build_id_start[i+BUILD_ID_HEADER_LEN]; Modified: head/sys/kern/kern_mtxpool.c ============================================================================== --- head/sys/kern/kern_mtxpool.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_mtxpool.c Thu Jan 30 20:05:05 2020 (r357312) @@ -57,7 +57,6 @@ __FBSDID("$FreeBSD$"); #include #include - static MALLOC_DEFINE(M_MTXPOOL, "mtx_pool", "mutex pool"); /* Pool sizes must be a power of two */ Modified: head/sys/kern/kern_pmc.c ============================================================================== --- head/sys/kern/kern_pmc.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_pmc.c Thu Jan 30 20:05:05 2020 (r357312) @@ -183,7 +183,6 @@ pmc_cpu_is_primary(int cpu) #endif } - /* * Return the maximum CPU number supported by the system. The return * value is used for scaling internal data structures and for runtime Modified: head/sys/kern/kern_poll.c ============================================================================== --- head/sys/kern/kern_poll.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_poll.c Thu Jan 30 20:05:05 2020 (r357312) @@ -247,7 +247,6 @@ static uint32_t idlepoll_sleeping; /* idlepoll is slee SYSCTL_UINT(_kern_polling, OID_AUTO, idlepoll_sleeping, CTLFLAG_RD, &idlepoll_sleeping, 0, "idlepoll is sleeping"); - #define POLL_LIST_LEN 128 struct pollrec { poll_handler_t *handler; @@ -272,7 +271,6 @@ init_device_poll(void) SHUTDOWN_PRI_LAST); } SYSINIT(device_poll, SI_SUB_SOFTINTR, SI_ORDER_MIDDLE, init_device_poll, NULL); - /* * Hook from hardclock. Tries to schedule a netisr, but keeps track Modified: head/sys/kern/kern_resource.c ============================================================================== --- head/sys/kern/kern_resource.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_resource.c Thu Jan 30 20:05:05 2020 (r357312) @@ -66,7 +66,6 @@ __FBSDID("$FreeBSD$"); #include #include - static MALLOC_DEFINE(M_PLIMIT, "plimit", "plimit structures"); static MALLOC_DEFINE(M_UIDINFO, "uidinfo", "uidinfo structures"); #define UIHASH(uid) (&uihashtbl[(uid) & uihash]) Modified: head/sys/kern/kern_sig.c ============================================================================== --- head/sys/kern/kern_sig.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_sig.c Thu Jan 30 20:05:05 2020 (r357312) @@ -865,7 +865,6 @@ freebsd4_sigaction(struct thread *td, struct freebsd4_ struct sigaction *actp, *oactp; int error; - actp = (uap->act != NULL) ? &act : NULL; oactp = (uap->oact != NULL) ? &oact : NULL; if (actp) { @@ -1964,7 +1963,6 @@ pgsignal(struct pgrp *pgrp, int sig, int checkctty, ks } } - /* * Recalculate the signal mask and reset the signal disposition after * usermode frame for delivery is formed. Should be called after @@ -1986,7 +1984,6 @@ postsig_done(int sig, struct thread *td, struct sigact if (SIGISMEMBER(ps->ps_sigreset, sig)) sigdflt(ps, sig); } - /* * Send a signal caused by a trap to the current thread. If it will be Modified: head/sys/kern/kern_switch.c ============================================================================== --- head/sys/kern/kern_switch.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_switch.c Thu Jan 30 20:05:05 2020 (r357312) @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ - #include __FBSDID("$FreeBSD$"); Modified: head/sys/kern/kern_sysctl.c ============================================================================== --- head/sys/kern/kern_sysctl.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_sysctl.c Thu Jan 30 20:05:05 2020 (r357312) @@ -737,7 +737,6 @@ sysctl_remove_name(struct sysctl_oid *parent, const ch return (error); } - static int sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del, int recurse) { @@ -1293,7 +1292,6 @@ sysctl_sysctl_oidfmt(SYSCTL_HANDLER_ARGS) return (error); } - static SYSCTL_NODE(_sysctl, CTL_SYSCTL_OIDFMT, oidfmt, CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_CAPRD, sysctl_sysctl_oidfmt, ""); @@ -1545,7 +1543,6 @@ sysctl_msec_to_ticks(SYSCTL_HANDLER_ARGS) *(int *)arg1 = tt; return (0); } - /* * Handle a long, signed or unsigned. Modified: head/sys/kern/kern_tc.c ============================================================================== --- head/sys/kern/kern_tc.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_tc.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1540,7 +1540,6 @@ SYSCTL_PROC(_kern_timecounter, OID_AUTO, hardware, CTL 0, 0, sysctl_kern_timecounter_hardware, "A", "Timecounter hardware selected"); - /* Report the available timecounter hardware. */ static int sysctl_kern_timecounter_choice(SYSCTL_HANDLER_ARGS) Modified: head/sys/kern/kern_time.c ============================================================================== --- head/sys/kern/kern_time.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_time.c Thu Jan 30 20:05:05 2020 (r357312) @@ -118,7 +118,6 @@ int itimespecfix(struct timespec *ts); SYSINIT(posix_timer, SI_SUB_P1003_1B, SI_ORDER_FIRST+4, itimer_start, NULL); - static int settime(struct thread *td, struct timeval *tv) { Modified: head/sys/kern/kern_ubsan.c ============================================================================== --- head/sys/kern/kern_ubsan.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_ubsan.c Thu Jan 30 20:05:05 2020 (r357312) @@ -26,7 +26,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ - /* * The micro UBSan implementation for the userland (uUBSan) and kernel (kUBSan). * The uBSSan versions is suitable for inclusion into libc or used standalone Modified: head/sys/kern/kern_umtx.c ============================================================================== --- head/sys/kern/kern_umtx.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/kern_umtx.c Thu Jan 30 20:05:05 2020 (r357312) @@ -715,7 +715,6 @@ umtxq_signal_queue(struct umtx_key *key, int n_wake, i return (ret); } - /* * Wake up specified thread. */ @@ -1577,7 +1576,6 @@ umtx_pi_setowner(struct umtx_pi *pi, struct thread *ow pi->pi_owner = owner; TAILQ_INSERT_TAIL(&uq_owner->uq_pi_contested, pi, pi_link); } - /* * Disown a PI mutex, and remove it from the owned list. Modified: head/sys/kern/link_elf.c ============================================================================== --- head/sys/kern/link_elf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/link_elf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1314,7 +1314,6 @@ elf_relocaddr(linker_file_t lf, Elf_Addr x) return (x); } - static void link_elf_unload_file(linker_file_t file) { Modified: head/sys/kern/link_elf_obj.c ============================================================================== --- head/sys/kern/link_elf_obj.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/link_elf_obj.c Thu Jan 30 20:05:05 2020 (r357312) @@ -87,7 +87,6 @@ typedef struct { int sec; } Elf_relaent; - typedef struct elf_file { struct linker_file lf; /* Common fields */ @@ -1269,7 +1268,6 @@ relocate_file(elf_file_t ef) int i; Elf_Size symidx; Elf_Addr base; - /* Perform relocations without addend if there are any: */ for (i = 0; i < ef->nreltab; i++) { Modified: head/sys/kern/sched_4bsd.c ============================================================================== --- head/sys/kern/sched_4bsd.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sched_4bsd.c Thu Jan 30 20:05:05 2020 (r357312) @@ -828,7 +828,6 @@ static void sched_priority(struct thread *td, u_char prio) { - KTR_POINT3(KTR_SCHED, "thread", sched_tdname(td), "priority change", "prio:%d", td->td_priority, "new prio:%d", prio, KTR_ATTR_LINKED, sched_tdname(curthread)); @@ -1297,7 +1296,6 @@ sched_add(struct thread *td, int flags) KTR_ATTR_LINKED, sched_tdname(td)); SDT_PROBE4(sched, , , enqueue, td, td->td_proc, NULL, flags & SRQ_PREEMPTED); - /* * Now that the thread is moving to the run-queue, set the lock Modified: head/sys/kern/sched_ule.c ============================================================================== --- head/sys/kern/sched_ule.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sched_ule.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1506,7 +1506,6 @@ sched_initticks(void *dummy) sched_idlespinthresh = 2 * max(10000, 6 * hz) / realstathz; } - /* * This is the core of the interactivity algorithm. Determines a score based * on past behavior. It is the ratio of sleep time to run time scaled to Modified: head/sys/kern/subr_acl_posix1e.c ============================================================================== --- head/sys/kern/subr_acl_posix1e.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_acl_posix1e.c Thu Jan 30 20:05:05 2020 (r357312) @@ -652,7 +652,6 @@ acl_posix1e_newfilemode(mode_t cmode, struct acl *dacl return (mode); } - static int acl_posix1e_modload(module_t mod, int what, void *arg) { Modified: head/sys/kern/subr_blist.c ============================================================================== --- head/sys/kern/subr_blist.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_blist.c Thu Jan 30 20:05:05 2020 (r357312) @@ -192,7 +192,6 @@ bitrange(int n, int count) ((u_daddr_t)-1 >> (BLIST_BMAP_RADIX - (n + count)))); } - /* * Find the first bit set in a u_daddr_t. */ Modified: head/sys/kern/subr_bufring.c ============================================================================== --- head/sys/kern/subr_bufring.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_bufring.c Thu Jan 30 20:05:05 2020 (r357312) @@ -29,14 +29,12 @@ #include __FBSDID("$FreeBSD$"); - #include #include #include #include #include #include - struct buf_ring * buf_ring_alloc(int count, struct malloc_type *type, int flags, struct mtx *lock) Modified: head/sys/kern/subr_bus.c ============================================================================== --- head/sys/kern/subr_bus.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_bus.c Thu Jan 30 20:05:05 2020 (r357312) @@ -3591,7 +3591,6 @@ resource_list_release_active(struct resource_list *rl, return (retval); } - /** * @brief Fully release a reserved resource * @@ -3906,7 +3905,6 @@ bus_generic_resume(device_t dev) } return (0); } - /** * @brief Helper function for implementing BUS_RESET_POST Modified: head/sys/kern/subr_clock.c ============================================================================== --- head/sys/kern/subr_clock.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_clock.c Thu Jan 30 20:05:05 2020 (r357312) @@ -84,7 +84,6 @@ SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock, CTLFLA * Derived from NetBSD arch/hp300/hp300/clock.c */ - #define FEBRUARY 2 #define days_in_year(y) (leapyear(y) ? 366 : 365) #define days_in_month(y, m) \ Modified: head/sys/kern/subr_csan.c ============================================================================== --- head/sys/kern/subr_csan.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_csan.c Thu Jan 30 20:05:05 2020 (r357312) @@ -493,7 +493,6 @@ kcsan_copyout(const void *kaddr, void *uaddr, size_t l atomic_subtract_##name(ptr, val); \ } - #define CSAN_ATOMIC_FUNC_SUBTRACT(name, type) \ _CSAN_ATOMIC_FUNC_SUBTRACT(name, type) \ _CSAN_ATOMIC_FUNC_SUBTRACT(acq_##name, type) \ @@ -535,7 +534,6 @@ kcsan_copyout(const void *kaddr, void *uaddr, size_t l return (atomic_testandset_##name(ptr, val)); \ } - CSAN_ATOMIC_FUNC_ADD(8, uint8_t) CSAN_ATOMIC_FUNC_CLEAR(8, uint8_t) CSAN_ATOMIC_FUNC_CMPSET(8, uint8_t) @@ -659,7 +657,6 @@ CSAN_ATOMIC_FUNC_TESTANDSET(ptr, uintptr_t) { \ atomic_thread_fence_##name(); \ } - CSAN_ATOMIC_FUNC_THREAD_FENCE(acq) CSAN_ATOMIC_FUNC_THREAD_FENCE(acq_rel) Modified: head/sys/kern/subr_fattime.c ============================================================================== --- head/sys/kern/subr_fattime.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_fattime.c Thu Jan 30 20:05:05 2020 (r357312) @@ -135,7 +135,6 @@ static const struct { { NOV + 3 * YEAR + 1, ENC(3, 12) } }; - void timespec2fattime(const struct timespec *tsp, int utc, uint16_t *ddp, uint16_t *dtp, uint8_t *dhp) Modified: head/sys/kern/subr_filter.c ============================================================================== --- head/sys/kern/subr_filter.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_filter.c Thu Jan 30 20:05:05 2020 (r357312) @@ -133,7 +133,6 @@ setup_time_filter_small(struct time_filter_small *tf, return(0); } - static void check_update_times(struct time_filter *tf, uint64_t value, uint32_t now) { @@ -204,8 +203,6 @@ check_update_times_small(struct time_filter_small *tf, } } - - void filter_reduce_by(struct time_filter *tf, uint64_t reduce_by, uint32_t now) { @@ -294,7 +291,6 @@ forward_filter_clock(struct time_filter *tf, uint32_t } } - void forward_filter_clock_small(struct time_filter_small *tf, uint32_t ticks_forward) { @@ -309,7 +305,6 @@ forward_filter_clock_small(struct time_filter_small *t } } - void tick_filter_clock(struct time_filter *tf, uint32_t now) { @@ -452,7 +447,6 @@ apply_filter_max(struct time_filter *tf, uint64_t valu check_update_times(tf, value, now); return (tf->entries[0].value); } - uint32_t apply_filter_max_small(struct time_filter_small *tf, Modified: head/sys/kern/subr_gtaskqueue.c ============================================================================== --- head/sys/kern/subr_gtaskqueue.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_gtaskqueue.c Thu Jan 30 20:05:05 2020 (r357312) @@ -156,7 +156,6 @@ _gtaskqueue_create(const char *name, int mflags, return (queue); } - /* * Signal a taskqueue thread to terminate. */ @@ -570,7 +569,6 @@ gtaskqueue_thread_enqueue(void *context) wakeup_any(tq); } - static struct gtaskqueue * gtaskqueue_create_fast(const char *name, int mflags, taskqueue_enqueue_fn enqueue, void *context) @@ -578,7 +576,6 @@ gtaskqueue_create_fast(const char *name, int mflags, return _gtaskqueue_create(name, mflags, enqueue, context, MTX_SPIN, "fast_taskqueue"); } - struct taskqgroup_cpu { LIST_HEAD(, grouptask) tgc_tasks; Modified: head/sys/kern/subr_hints.c ============================================================================== --- head/sys/kern/subr_hints.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_hints.c Thu Jan 30 20:05:05 2020 (r357312) @@ -135,7 +135,6 @@ res_find(char **hintp_cookie, int *line, int *startln, char *hintp, *p; bool dyn_used = false; - /* * We are expecting that the caller will pass us a hintp_cookie that * they are tracking. Upon entry, if *hintp_cookie is *not* set, this @@ -448,7 +447,6 @@ resource_find_match(int *anchor, const char **name, in *anchor = newln; return ret; } - /* * err = resource_find_dev(&anchor, name, &unit, res, value); Modified: head/sys/kern/subr_intr.c ============================================================================== --- head/sys/kern/subr_intr.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_intr.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1262,7 +1262,6 @@ void intr_free_intr_map_data(struct intr_map_data *dat free(data, M_INTRNG); } - /* * Register a MSI/MSI-X interrupt controller */ @@ -1376,7 +1375,6 @@ intr_alloc_msix(device_t pci, device_t child, intptr_t ("%s: Found a non-MSI controller: %s", __func__, device_get_name(pic->pic_dev))); - err = MSI_ALLOC_MSIX(pic->pic_dev, child, &pdev, &isrc); if (err != 0) return (err); @@ -1445,7 +1443,6 @@ intr_map_msi(device_t pci, device_t child, intptr_t xr return (err); } - void dosoftints(void); void dosoftints(void) @@ -1594,7 +1591,6 @@ intr_map_copy_map_data(u_int res_id, device_t *map_dev *map_xref = irq_map[res_id]->xref; mtx_unlock(&irq_map_lock); } - /* * Allocate and fill new entry in irq_map table. Modified: head/sys/kern/subr_kdb.c ============================================================================== --- head/sys/kern/subr_kdb.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_kdb.c Thu Jan 30 20:05:05 2020 (r357312) @@ -258,7 +258,6 @@ kdb_sysctl_stack_overflow(SYSCTL_HANDLER_ARGS) return (0); } - void kdb_panic(const char *msg) { Modified: head/sys/kern/subr_sbuf.c ============================================================================== --- head/sys/kern/subr_sbuf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_sbuf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -302,7 +302,6 @@ void sbuf_set_flags(struct sbuf *s, int flags) { - s->s_flags |= (flags & SBUF_USRFLAGMSK); } Modified: head/sys/kern/subr_sleepqueue.c ============================================================================== --- head/sys/kern/subr_sleepqueue.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_sleepqueue.c Thu Jan 30 20:05:05 2020 (r357312) @@ -92,7 +92,6 @@ __FBSDID("$FreeBSD$"); #include #endif - /* * Constants for the hash table of sleep queue chains. * SC_TABLESIZE must be a power of two for SC_MASK to work properly. Modified: head/sys/kern/subr_smp.c ============================================================================== --- head/sys/kern/subr_smp.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_smp.c Thu Jan 30 20:05:05 2020 (r357312) @@ -803,7 +803,6 @@ smp_topo_2level(int l2share, int l2count, int l1share, return (top); } - struct cpu_group * smp_topo_find(struct cpu_group *top, int cpu) { @@ -1005,7 +1004,6 @@ sysctl_kern_smp_active(SYSCTL_HANDLER_ARGS) error = SYSCTL_OUT(req, &active, sizeof(active)); return (error); } - #ifdef SMP void Modified: head/sys/kern/subr_stats.c ============================================================================== --- head/sys/kern/subr_stats.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_stats.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1733,7 +1733,6 @@ stats_voistatdata_tdgst_tostr(enum vsd_dtype voi_dtype sizeof(qstr)); sbuf_cat(buf, qstr); - switch (fmt) { case SB_STRFMT_FREEFORM: fmtstr = is32bit ? ",cnt=%u}" : ",cnt=%ju}"; Modified: head/sys/kern/subr_unit.c ============================================================================== --- head/sys/kern/subr_unit.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_unit.c Thu Jan 30 20:05:05 2020 (r357312) @@ -143,7 +143,6 @@ _Malloc(size_t foo, int line) struct unrhdr; - struct mtx { int state; } unitmtx; @@ -225,7 +224,6 @@ ub_full(struct unrb *ub, int len) return (first_clear == -1); } - #if defined(DIAGNOSTIC) || !defined(_KERNEL) /* * Consistency check function. @@ -276,7 +274,6 @@ check_unrhdr(struct unrhdr *uh __unused, int line __un #endif - /* * Userland memory management. Just use calloc and keep track of how * many elements we have allocated for check_unrhdr(). @@ -1044,7 +1041,6 @@ main(int argc, char **argv) usage(argv); exit(2); } - } Modified: head/sys/kern/subr_vmem.c ============================================================================== --- head/sys/kern/subr_vmem.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_vmem.c Thu Jan 30 20:05:05 2020 (r357312) @@ -201,7 +201,6 @@ static uma_zone_t vmem_zone; #define VMEM_CONDVAR_WAIT(vm) cv_wait(&vm->vm_cv, &vm->vm_lock) #define VMEM_CONDVAR_BROADCAST(vm) cv_broadcast(&vm->vm_cv) - #define VMEM_LOCK(vm) mtx_lock(&vm->vm_lock) #define VMEM_TRYLOCK(vm) mtx_trylock(&vm->vm_lock) #define VMEM_UNLOCK(vm) mtx_unlock(&vm->vm_lock) Modified: head/sys/kern/subr_witness.c ============================================================================== --- head/sys/kern/subr_witness.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/subr_witness.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1915,7 +1915,6 @@ depart(struct witness *w) witness_increment_graph_generation(); } - static void adopt(struct witness *parent, struct witness *child) { @@ -2893,7 +2892,6 @@ witness_hash_djb2(const uint8_t *key, uint32_t size) return (hash); } - /* * Initializes the two witness hash tables. Called exactly once from * witness_initialize(). @@ -2965,7 +2963,6 @@ witness_hash_put(struct witness *w) w_hash.wh_array[hash] = w; w_hash.wh_count++; } - static struct witness_lock_order_data * witness_lock_order_get(struct witness *parent, struct witness *child) Modified: head/sys/kern/sys_generic.c ============================================================================== --- head/sys/kern/sys_generic.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sys_generic.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1525,7 +1525,6 @@ pollrescan(struct thread *td) return (0); } - static int pollout(struct thread *td, struct pollfd *fds, struct pollfd *ufds, u_int nfd) { Modified: head/sys/kern/sys_pipe.c ============================================================================== --- head/sys/kern/sys_pipe.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sys_pipe.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1606,7 +1606,6 @@ pipeclose(struct pipe *cpipe) pipelock(cpipe, 0); } - /* * Disconnect from peer, if any. */ Modified: head/sys/kern/sys_process.c ============================================================================== --- head/sys/kern/sys_process.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sys_process.c Thu Jan 30 20:05:05 2020 (r357312) @@ -880,7 +880,6 @@ kern_ptrace(struct thread *td, int req, pid_t pid, voi } } - /* OK */ break; Modified: head/sys/kern/sysv_msg.c ============================================================================== --- head/sys/kern/sysv_msg.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sysv_msg.c Thu Jan 30 20:05:05 2020 (r357312) @@ -99,7 +99,6 @@ static int msg_prison_get(void *, void *); static int msg_prison_remove(void *, void *); static void msg_prison_cleanup(struct prison *); - #ifdef MSG_DEBUG #define DPRINTF(a) printf a #else @@ -351,7 +350,6 @@ msgunload() mtx_destroy(&msq_mtx); return (0); } - static int sysvmsg_modload(struct module *module, int cmd, void *arg) Modified: head/sys/kern/sysv_shm.c ============================================================================== --- head/sys/kern/sysv_shm.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/sysv_shm.c Thu Jan 30 20:05:05 2020 (r357312) @@ -609,7 +609,6 @@ kern_shmctl(struct thread *td, int shmid, int cmd, voi return (error); } - #ifndef _SYS_SYSPROTO_H_ struct shmctl_args { int shmid; @@ -657,7 +656,6 @@ done: } return (error); } - static int shmget_existing(struct thread *td, struct shmget_args *uap, int mode, Modified: head/sys/kern/uipc_mbuf.c ============================================================================== --- head/sys/kern/uipc_mbuf.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/uipc_mbuf.c Thu Jan 30 20:05:05 2020 (r357312) @@ -2113,7 +2113,6 @@ mbprof_clr_handler(SYSCTL_HANDLER_ARGS) return (error); } - SYSCTL_PROC(_kern_ipc, OID_AUTO, mbufprofile, CTLTYPE_STRING|CTLFLAG_RD, NULL, 0, mbprof_handler, "A", "mbuf profiling statistics"); Modified: head/sys/kern/uipc_usrreq.c ============================================================================== --- head/sys/kern/uipc_usrreq.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/uipc_usrreq.c Thu Jan 30 20:05:05 2020 (r357312) @@ -316,7 +316,6 @@ static int unp_externalize_fp(struct file *); static struct mbuf *unp_addsockcred(struct thread *, struct mbuf *); static void unp_process_defers(void * __unused, int); - static void unp_pcb_hold(struct unpcb *unp) { @@ -385,7 +384,6 @@ unp_pcb_owned_lock2_slowpath(struct unpcb *unp, struct unp_pcb_owned_lock2_slowpath((unp), &(unp2), &freed); \ } while (0) - /* * Definitions of protocols supported in the LOCAL domain. */ @@ -705,7 +703,6 @@ uipc_close(struct socket *so) unp = sotounpcb(so); KASSERT(unp != NULL, ("uipc_close: unp == NULL")); - vplock = NULL; if ((vp = unp->unp_vnode) != NULL) { vplock = mtx_pool_find(mtxpool_sleep, vp); @@ -1025,7 +1022,6 @@ connect_internal(struct socket *so, struct sockaddr *n } return (error); } - static int uipc_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, Modified: head/sys/kern/vfs_acl.c ============================================================================== --- head/sys/kern/vfs_acl.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_acl.c Thu Jan 30 20:05:05 2020 (r357312) @@ -67,7 +67,6 @@ CTASSERT(ACL_MAX_ENTRIES >= OLDACL_MAX_ENTRIES); MALLOC_DEFINE(M_ACL, "acl", "Access Control Lists"); - static int kern___acl_aclcheck_path(struct thread *td, const char *path, acl_type_t type, struct acl *aclp, int follow); static int kern___acl_delete_path(struct thread *td, const char *path, Modified: head/sys/kern/vfs_bio.c ============================================================================== --- head/sys/kern/vfs_bio.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_bio.c Thu Jan 30 20:05:05 2020 (r357312) @@ -779,7 +779,6 @@ bufspace_wait(struct bufdomain *bd, struct vnode *vp, BD_UNLOCK(bd); } - /* * bufspace_daemon: * @@ -941,7 +940,6 @@ waitrunningbufspace(void) } mtx_unlock(&rbreqlock); } - /* * vfs_buf_test_cache: Modified: head/sys/kern/vfs_cluster.c ============================================================================== --- head/sys/kern/vfs_cluster.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_cluster.c Thu Jan 30 20:05:05 2020 (r357312) @@ -802,7 +802,6 @@ cluster_write(struct vnode *vp, struct buf *bp, u_quad vp->v_lasta = bp->b_blkno; } - /* * This is an awful lot like cluster_rbuild...wish they could be combined. * The last lbn argument is the current block on which I/O is being Modified: head/sys/kern/vfs_extattr.c ============================================================================== --- head/sys/kern/vfs_extattr.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_extattr.c Thu Jan 30 20:05:05 2020 (r357312) @@ -673,7 +673,6 @@ extattr_list_vp(struct vnode *vp, int attrnamespace, v return (error); } - #ifndef _SYS_SYSPROTO_H_ struct extattr_list_fd_args { int fd; Modified: head/sys/kern/vfs_init.c ============================================================================== --- head/sys/kern/vfs_init.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_init.c Thu Jan 30 20:05:05 2020 (r357312) @@ -523,7 +523,6 @@ vfs_register(struct vfsconf *vfc) return (0); } - /* Remove registration of a filesystem type */ static int vfs_unregister(struct vfsconf *vfc) Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_subr.c Thu Jan 30 20:05:05 2020 (r357312) @@ -699,7 +699,6 @@ vntblinit(void *dummy __unused) } SYSINIT(vfs, SI_SUB_VFS, SI_ORDER_FIRST, vntblinit, NULL); - /* * Mark a mount point as busy. Used to synchronize access and to delay * unmounting. Eventually, mountlist_mtx is not released on failure. @@ -6129,7 +6128,6 @@ vfs_cache_root_set(struct mount *mp, struct vnode *vp) * * This interface replaces MNT_VNODE_FOREACH. */ - struct vnode * __mnt_vnode_next_all(struct vnode **mvp, struct mount *mp) Modified: head/sys/kern/vfs_syscalls.c ============================================================================== --- head/sys/kern/vfs_syscalls.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_syscalls.c Thu Jan 30 20:05:05 2020 (r357312) @@ -4199,7 +4199,6 @@ getvnode(struct thread *td, int fd, cap_rights_t *righ return (0); } - /* * Get an (NFS) file handle. */ Modified: head/sys/kern/vfs_vnops.c ============================================================================== --- head/sys/kern/vfs_vnops.c Thu Jan 30 20:02:14 2020 (r357311) +++ head/sys/kern/vfs_vnops.c Thu Jan 30 20:05:05 2020 (r357312) @@ -1293,7 +1293,6 @@ vn_io_fault_pgmove(vm_page_t ma[], vm_offset_t offset, return (0); } - /* * File table truncate routine. */ @@ -1855,7 +1854,6 @@ vn_finished_write(struct mount *mp) MNT_IUNLOCK(mp); } - /* * Filesystem secondary write operation has completed. If we are * suspending and this operation is the last one, notify the suspender @@ -1876,8 +1874,6 @@ vn_finished_secondary_write(struct mount *mp) wakeup(&mp->mnt_secondary_writes); MNT_IUNLOCK(mp); } - - /* * Request a filesystem to suspend write operations.