The branch main has been updated by emaste:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=b1a217a369186dc45c7df7bde13a87868fd5b2c8

commit b1a217a369186dc45c7df7bde13a87868fd5b2c8
Author:     Ed Maste <[email protected]>
AuthorDate: 2021-08-16 14:29:44 +0000
Commit:     Ed Maste <[email protected]>
CommitDate: 2021-08-16 14:29:44 +0000

    sys/cddl: remove extraneous semicolons
    
    Fixes:          5a1b490d502e ("FreeBSD changes to vendor source.")
    Fixes:          91eaf3e1831d ("Custom DTrace kernel module...")
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
---
 sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 2 +-
 sys/cddl/dev/fbt/fbt.c                                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c 
b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
index a59edb05e2b6..ad14482b80b5 100644
--- a/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
+++ b/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
@@ -14830,7 +14830,7 @@ static int
 dtrace_state_buffer(dtrace_state_t *state, dtrace_buffer_t *buf, int which)
 {
        dtrace_optval_t *opt = state->dts_options, size;
-       processorid_t cpu = 0;;
+       processorid_t cpu = 0;
        int flags = 0, rval, factor, divisor = 1;
 
        ASSERT(MUTEX_HELD(&dtrace_lock));
diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c
index 3bad4243c040..2137075e3831 100644
--- a/sys/cddl/dev/fbt/fbt.c
+++ b/sys/cddl/dev/fbt/fbt.c
@@ -367,7 +367,7 @@ fbt_resume(void *arg, dtrace_id_t id, void *parg)
 static int
 fbt_ctfoff_init(modctl_t *lf, linker_ctf_t *lc)
 {
-       const Elf_Sym *symp = lc->symtab;;
+       const Elf_Sym *symp = lc->symtab;
        const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;
        const uint8_t *ctfdata = lc->ctftab + sizeof(ctf_header_t);
        int i;
@@ -799,7 +799,7 @@ fbt_array_info(linker_ctf_t *lc, ctf_id_t type, 
ctf_arinfo_t *arp)
 static const char *
 ctf_strptr(linker_ctf_t *lc, int name)
 {
-       const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;;
+       const ctf_header_t *hp = (const ctf_header_t *) lc->ctftab;
        const char *strp = "";
 
        if (name < 0 || name >= hp->cth_strlen)
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to