 @@ -1,14 +1,14 @@
-/*	$NetBSD: kern_ksyms.c,v 1.87 2017/11/04 22:17:55 christos Exp $	*/
+/*	$NetBSD: kern_ksyms.c,v 1.87.8.1 2020/01/07 11:54:57 martin Exp $	*/
 /*-
  * Copyright (c) 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software developed for The NetBSD Foundation
  * by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -63,27 +63,27 @@
  * struct, placed in a circular list. The first entry is the kernel
  * symbol table.
  */
 /*
  * TODO:
+ *
  *	Add support for mmap, poll.
  *	Constify tables.
  *	Constify db_symtab and move it to .rodata.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.87 2017/11/04 22:17:55 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ksyms.c,v 1.87.8.1 2020/01/07 11:54:57 martin Exp $");
 #if defined(_KERNEL) && defined(_KERNEL_OPT)
 #include "opt_copy_symtab.h"
 #include "opt_ddb.h"
 #include "opt_dtrace.h"
 #endif
 #define _KSYMS_PRIVATE
 #include <sys/param.h>
 #include <sys/queue.h>
 #include <sys/exec.h>
 #include <sys/systm.h>
 @@ -755,29 +755,29 @@ ksyms_modload(const char *name, void *sy
  */
 void
 ksyms_modunload(const char *name)
+{
 	struct ksyms_symtab *st;
 	mutex_enter(&ksyms_lock);
 	TAILQ_FOREACH(st, &ksyms_symtabs, sd_queue) {
 		if (st->sd_gone)
 			continue;
 		if (strcmp(name, st->sd_name) != 0)
 			continue;
 		st->sd_gone = true;
 		ksyms_sizes_calc();
 		if (!ksyms_isopen) {
 			TAILQ_REMOVE(&ksyms_symtabs, st, sd_queue);
 			ksyms_sizes_calc();
 			kmem_free(st->sd_nmap,
 				  st->sd_nmapsize * sizeof(uint32_t));
 			kmem_free(st, sizeof(*st));
+		}
 		break;
+	}
 	mutex_exit(&ksyms_lock);
 	KASSERT(st != NULL);
+}
 #ifdef DDB
 /*
  * Keep sifting stuff here, to avoid export of ksyms internals.
 @@ -846,26 +846,28 @@ ksyms_sift(char *mod, char *sym, int mod
  * The actual (correct) value of st_name is preserved through a global
  * offset stored in the symbol table structure.
+ *
  * Call with ksyms_lock held.
  */
 static void
 ksyms_sizes_calc(void)
+{
 	struct ksyms_symtab *st;
 	int i, delta;
 	ksyms_symsz = ksyms_strsz = 0;
 	TAILQ_FOREACH(st, &ksyms_symtabs, sd_queue) {
 		if (__predict_false(st->sd_gone))
 			continue;
 		delta = ksyms_strsz - st->sd_usroffset;
 		if (delta != 0) {
 			for (i = 0; i < st->sd_symsize/sizeof(Elf_Sym); i++)
 				st->sd_symstart[i].st_name += delta;
 			st->sd_usroffset = ksyms_strsz;
+		}
 		ksyms_symsz += st->sd_symsize;
 		ksyms_strsz += st->sd_strsize;
+	}
+}
 static void
 ksyms_fill_note(void)
 @@ -1024,44 +1026,48 @@ ksymsread(dev_t dev, struct uio *uio, in
 	off = uio->uio_offset;
 	if (off < sizeof(struct ksyms_hdr)) {
 		error = uiomove((char *)&ksyms_hdr + off,
 		    sizeof(struct ksyms_hdr) - off, uio);
 		if (error != 0)
 			return error;
+	}
 	/*
 	 * Copy out the symbol table.
 	 */
 	filepos = sizeof(struct ksyms_hdr);
 	TAILQ_FOREACH(st, &ksyms_symtabs, sd_queue) {
 		if (__predict_false(st->sd_gone))
 			continue;
 		if (uio->uio_resid == 0)
 			return 0;
 		if (uio->uio_offset <= st->sd_symsize + filepos) {
 			inpos = uio->uio_offset - filepos;
 			error = uiomove((char *)st->sd_symstart + inpos,
 			   st->sd_symsize - inpos, uio);
 			if (error != 0)
 				return error;
+		}
 		filepos += st->sd_symsize;
+	}
 	/*
 	 * Copy out the string table
 	 */
 	KASSERT(filepos == sizeof(struct ksyms_hdr) +
 	    ksyms_hdr.kh_shdr[SYMTAB].sh_size);
 	TAILQ_FOREACH(st, &ksyms_symtabs, sd_queue) {
 		if (__predict_false(st->sd_gone))
 			continue;
 		if (uio->uio_resid == 0)
 			return 0;
 		if (uio->uio_offset <= st->sd_strsize + filepos) {
 			inpos = uio->uio_offset - filepos;
 			error = uiomove((char *)st->sd_strstart + inpos,
 			   st->sd_strsize - inpos, uio);
 			if (error != 0)
 				return error;
+		}
 		filepos += st->sd_strsize;
+	}
 	/*