11740 loader: warning: unused parameter

Reviewed by: Andy Fiddaman <omnios@citrus-it.co.uk>
Approved by: Dan McDonald <danmcd@joyent.com>

30 files changed, 85 insertions, 75 deletions

diff --git a/usr/src/boot/lib/libstand/arp.c b/usr/src/boot/lib/libstand/arp.c
index 8131ed6c9e..d55595d8ff 100644
--- a/usr/src/boot/lib/libstand/arp.c
+++ b/usr/src/boot/lib/libstand/arp.c
@@ -156,7 +156,8 @@ arpsend(struct iodesc *d, void *pkt, size_t len)
  * else -1 (and errno == 0)
  */
 static ssize_t
-arprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft, void *extra)
+arprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft,
+    void *extra __unused)
 {
 	ssize_t n;
 	struct ether_arp *ah;
diff --git a/usr/src/boot/lib/libstand/bootp.c b/usr/src/boot/lib/libstand/bootp.c
index a17d399019..080e90d7a5 100644
--- a/usr/src/boot/lib/libstand/bootp.c
+++ b/usr/src/boot/lib/libstand/bootp.c
@@ -279,7 +279,7 @@ bootpsend(struct iodesc *d, void *pkt, size_t len)
 
 static ssize_t
 bootprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft,
-    void *extra)
+    void *extra __unused)
 {
 	ssize_t n;
 	struct bootp *bp;
diff --git a/usr/src/boot/lib/libstand/nullfs.c b/usr/src/boot/lib/libstand/nullfs.c
index 78b0940ba8..91fe6efb2c 100644
--- a/usr/src/boot/lib/libstand/nullfs.c
+++ b/usr/src/boot/lib/libstand/nullfs.c
@@ -68,44 +68,47 @@
  * Null filesystem
  */
 int
-null_open(const char *path, struct open_file *f)
+null_open(const char *path __unused, struct open_file *f __unused)
 {
 	return EINVAL;
 }
 
 int
-null_close(struct open_file *f)
+null_close(struct open_file *f __unused)
 {
 	return 0;
 }
 
 int
-null_read(struct open_file *f, void *buf, size_t size, size_t *resid)
+null_read(struct open_file *f __unused, void *buf __unused,
+    size_t size __unused, size_t *resid __unused)
 {
 	return EIO;
 }
 
 int
-null_write(struct open_file *f, const void *buf, size_t size, size_t *resid)
+null_write(struct open_file *f __unused, const void *buf __unused,
+    size_t size __unused, size_t *resid __unused)
 {
 	return EROFS;
 }
 
 off_t
-null_seek(struct open_file *f, off_t offset, int where)
+null_seek(struct open_file *f __unused, off_t offset __unused,
+    int where __unused)
 {
 	errno = EIO;
 	return -1;
 }
 
 int
-null_stat(struct open_file *f, struct stat *sb)
+null_stat(struct open_file *f __unused, struct stat *sb __unused)
 {
 	return EIO;
 }
 
 int
-null_readdir(struct open_file *f, struct dirent *d)
+null_readdir(struct open_file *f __unused, struct dirent *d __unused)
 {
 	return EIO;
 }
diff --git a/usr/src/boot/lib/libstand/printf.c b/usr/src/boot/lib/libstand/printf.c
index ff87539e79..55a1c7aad2 100644
--- a/usr/src/boot/lib/libstand/printf.c
+++ b/usr/src/boot/lib/libstand/printf.c
@@ -61,7 +61,7 @@ static char *ksprintn(char *, uintmax_t, int, int *, int);
 static int kvprintf(char const *, kvprintf_fn_t *, void *, int, va_list);
 
 static void
-putchar_wrapper(int cc, void *arg)
+putchar_wrapper(int cc, void *arg __unused)
 {
 
 	putchar(cc);
diff --git a/usr/src/boot/lib/libstand/rarp.c b/usr/src/boot/lib/libstand/rarp.c
index 0a835883a7..f7a624d08c 100644
--- a/usr/src/boot/lib/libstand/rarp.c
+++ b/usr/src/boot/lib/libstand/rarp.c
@@ -143,7 +143,7 @@ rarpsend(struct iodesc *d, void *pkt, size_t len)
  */
 static ssize_t
 rarprecv(struct iodesc *d, void **pkt, void **payload, time_t tleft,
-    void *extra)
+    void *extra __unused)
 {
 	ssize_t n;
 	struct ether_arp *ap;
diff --git a/usr/src/boot/lib/libstand/rpc.c b/usr/src/boot/lib/libstand/rpc.c
index 40dfeac224..ed5c9fc5cb 100644
--- a/usr/src/boot/lib/libstand/rpc.c
+++ b/usr/src/boot/lib/libstand/rpc.c
@@ -216,7 +216,8 @@ rpc_call(struct iodesc *d, n_long prog, n_long vers, n_long proc,
  * Remaining checks are done by callrpc
  */
 static ssize_t
-recvrpc(struct iodesc *d, void **pkt, void **payload, time_t tleft, void *extra)
+recvrpc(struct iodesc *d, void **pkt, void **payload, time_t tleft,
+    void *extra __unused)
 {
 	void *ptr;
 	struct rpc_reply *reply;
diff --git a/usr/src/boot/lib/libstand/zalloc_malloc.c b/usr/src/boot/lib/libstand/zalloc_malloc.c
index 0551b8c945..3105341c7b 100644
--- a/usr/src/boot/lib/libstand/zalloc_malloc.c
+++ b/usr/src/boot/lib/libstand/zalloc_malloc.c
@@ -52,7 +52,7 @@ void mallocstats(void);
 static void *Malloc_align(size_t, size_t);
 
 void *
-Malloc(size_t bytes, const char *file, int line)
+Malloc(size_t bytes, const char *file __unused, int line __unused)
 {
 	return (Malloc_align(bytes, 1));
 }
diff --git a/usr/src/boot/lib/libstand/zfs/devicename_stubs.c b/usr/src/boot/lib/libstand/zfs/devicename_stubs.c
index 41bf907e0c..dc0c0a556e 100644
--- a/usr/src/boot/lib/libstand/zfs/devicename_stubs.c
+++ b/usr/src/boot/lib/libstand/zfs/devicename_stubs.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 2012 Andriy Gapon <avg@FreeBSD.org>
  * All rights reserved.
  *
@@ -25,21 +25,21 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include "libzfs.h"
 
 __attribute__((weak))
 int
-zfs_parsedev(struct zfs_devdesc *dev, const char *devspec, const char **path)
+zfs_parsedev(struct zfs_devdesc *dev __unused, const char *devspec __unused,
+    const char **path __unused)
 {
 	return (EINVAL);
 }
 
 __attribute__((weak))
 char *
-zfs_fmtdev(void *vdev)
+zfs_fmtdev(void *vdev __unused)
 {
     static char	buf[128];
 
diff --git a/usr/src/boot/lib/libstand/zfs/gzip.c b/usr/src/boot/lib/libstand/zfs/gzip.c
index 676d1cb87f..36afd981a6 100644
--- a/usr/src/boot/lib/libstand/zfs/gzip.c
+++ b/usr/src/boot/lib/libstand/zfs/gzip.c
@@ -55,7 +55,8 @@ z_uncompress(void *dst, size_t *dstlen, const void *src, size_t srclen)
 }
 
 int
-gzip_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+gzip_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len,
+    int n __unused)
 {
 	size_t dstlen = d_len;
 
diff --git a/usr/src/boot/lib/libstand/zfs/zfs.c b/usr/src/boot/lib/libstand/zfs/zfs.c
index 77ec5dbbad..fca8c88b9d 100644
--- a/usr/src/boot/lib/libstand/zfs/zfs.c
+++ b/usr/src/boot/lib/libstand/zfs/zfs.c
@@ -358,7 +358,8 @@ zfs_readdir(struct open_file *f, struct dirent *d)
 }
 
 static int
-vdev_read(vdev_t *vdev, void *priv, off_t offset, void *buf, size_t bytes)
+vdev_read(vdev_t *vdev __unused, void *priv, off_t offset, void *buf,
+    size_t bytes)
 {
 	int fd, ret;
 	size_t res, size, remainder, rb_size, blksz;
@@ -648,8 +649,9 @@ zfs_dev_close(struct open_file *f)
 }
 
 static int
-zfs_dev_strategy(void *devdata, int rw, daddr_t dblk, size_t size,
-    char *buf, size_t *rsize)
+zfs_dev_strategy(void *devdata __unused, int rw __unused,
+    daddr_t dblk __unused, size_t size __unused,
+    char *buf __unused, size_t *rsize __unused)
 {
 
 	return (ENOSYS);
diff --git a/usr/src/boot/lib/libstand/zfs/zfsimpl.c b/usr/src/boot/lib/libstand/zfs/zfsimpl.c
index 3958b4af4a..458fc1ec1e 100644
--- a/usr/src/boot/lib/libstand/zfs/zfsimpl.c
+++ b/usr/src/boot/lib/libstand/zfs/zfsimpl.c
@@ -2383,7 +2383,8 @@ objset_get_dnode(const spa_t *spa, const objset_phys_t *os, uint64_t objnum, dno
 }
 
 static int
-mzap_rlookup(const spa_t *spa, const dnode_phys_t *dnode, char *name, uint64_t value)
+mzap_rlookup(const spa_t *spa __unused, const dnode_phys_t *dnode, char *name,
+    uint64_t value)
 {
 	const mzap_phys_t *mz;
 	const mzap_ent_phys_t *mze;
diff --git a/usr/src/boot/sys/boot/common/dev_net.c b/usr/src/boot/sys/boot/common/dev_net.c
index 279b902f6c..1af06a1e2d 100644
--- a/usr/src/boot/sys/boot/common/dev_net.c
+++ b/usr/src/boot/sys/boot/common/dev_net.c
@@ -227,8 +227,8 @@ net_cleanup(void)
 }
 
 static int
-net_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf,
-    size_t *rsize)
+net_strategy(void *devdata __unused, int rw __unused, daddr_t blk __unused,
+    size_t size __unused, char *buf __unused, size_t *rsize __unused)
 {
 
 	return (EIO);
diff --git a/usr/src/boot/sys/boot/efi/libefi/efinet.c b/usr/src/boot/sys/boot/efi/libefi/efinet.c
index 45e7dc0601..7237614d72 100644
--- a/usr/src/boot/sys/boot/efi/libefi/efinet.c
+++ b/usr/src/boot/sys/boot/efi/libefi/efinet.c
@@ -198,7 +198,7 @@ efinet_get(struct iodesc *desc, void **pkt, time_t timeout)
 }
 
 static void
-efinet_init(struct iodesc *desc, void *machdep_hint)
+efinet_init(struct iodesc *desc, void *machdep_hint __unused)
 {
 	struct netif *nif = desc->io_netif;
 	EFI_SIMPLE_NETWORK *net;
diff --git a/usr/src/boot/sys/boot/efi/libefi/env.c b/usr/src/boot/sys/boot/efi/libefi/env.c
index 231e90d5a1..eabee1dd07 100644
--- a/usr/src/boot/sys/boot/efi/libefi/env.c
+++ b/usr/src/boot/sys/boot/efi/libefi/env.c
@@ -392,7 +392,8 @@ efi_print_other_value(uint8_t *data, UINTN datasz)
 
 /* This appears to be some sort of UEFI shell alias table. */
 static int
-efi_print_shell_str(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz)
+efi_print_shell_str(const CHAR16 *varnamearg __unused, uint8_t *data,
+    UINTN datasz __unused)
 {
 	printf(" = %S", (CHAR16 *)data);
 	if (pager_output("\n"))
@@ -445,7 +446,8 @@ efi_memory_type(EFI_MEMORY_TYPE type)
 
 /* Print memory type table. */
 static int
-efi_print_mem_type(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz)
+efi_print_mem_type(const CHAR16 *varnamearg __unused, uint8_t *data,
+    UINTN datasz)
 {
 	int i, n;
 	EFI_MEMORY_TYPE_INFORMATION *ti;
@@ -470,7 +472,8 @@ efi_print_mem_type(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz)
  * We have LoaderPath and LoaderDev as CHAR16 strings.
  */
 static int
-efi_print_illumos(const CHAR16 *varnamearg, uint8_t *data, UINTN datasz)
+efi_print_illumos(const CHAR16 *varnamearg, uint8_t *data,
+    UINTN datasz __unused)
 {
 	int rv = -1;
 	char *var = NULL;
diff --git a/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c b/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c
index 76e13bb712..844d759c06 100644
--- a/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c
+++ b/usr/src/boot/sys/boot/efi/loader/arch/amd64/trap.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 2016 The FreeBSD Foundation
  * All rights reserved.
  *
@@ -376,7 +376,7 @@ efi_unredirect_exceptions(void)
 }
 
 static int
-command_grab_faults(int argc, char *argv[])
+command_grab_faults(int argc __unused, char *argv[] __unused)
 {
 	int res;
 
@@ -388,7 +388,7 @@ command_grab_faults(int argc, char *argv[])
 COMMAND_SET(grap_faults, "grab_faults", "grab faults", command_grab_faults);
 
 static int
-command_ungrab_faults(int argc, char *argv[])
+command_ungrab_faults(int argc __unused, char *argv[] __unused)
 {
 
 	efi_unredirect_exceptions();
@@ -398,7 +398,7 @@ COMMAND_SET(ungrab_faults, "ungrab_faults", "ungrab faults",
     command_ungrab_faults);
 
 static int
-command_fault(int argc, char *argv[])
+command_fault(int argc __unused, char *argv[] __unused)
 {
 
 	__asm("ud2");
diff --git a/usr/src/boot/sys/boot/efi/loader/efi_main.c b/usr/src/boot/sys/boot/efi/loader/efi_main.c
index 23a86a4ae6..c5abd20ab3 100644
--- a/usr/src/boot/sys/boot/efi/loader/efi_main.c
+++ b/usr/src/boot/sys/boot/efi/loader/efi_main.c
@@ -42,7 +42,7 @@ efi_exit(EFI_STATUS exit_code)
 }
 
 void
-exit(int status)
+exit(int status __unused)
 {
 
 	efi_exit(EFI_LOAD_ERROR);
diff --git a/usr/src/boot/sys/boot/efi/loader/memmap.c b/usr/src/boot/sys/boot/efi/loader/memmap.c
index 9862e51b5a..f3545a4d64 100644
--- a/usr/src/boot/sys/boot/efi/loader/memmap.c
+++ b/usr/src/boot/sys/boot/efi/loader/memmap.c
@@ -166,7 +166,7 @@ efi_addsmapdata(struct preloaded_file *kfp)
 COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap);
 
 static int
-command_smap(int argc, char *argv[])
+command_smap(int argc __unused, char *argv[] __unused)
 {
 	u_int i;
 
diff --git a/usr/src/boot/sys/boot/i386/libi386/biosmem.c b/usr/src/boot/sys/boot/i386/libi386/biosmem.c
index 05d3c2521f..cf13e6016c 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biosmem.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biosmem.c
@@ -225,7 +225,7 @@ bios_getmem(void)
 }
 
 static int
-command_biosmem(int argc, char *argv[])
+command_biosmem(int argc __unused, char *argv[] __unused)
 {
 	int bq = bios_getquirks();
 
diff --git a/usr/src/boot/sys/boot/i386/libi386/biossmap.c b/usr/src/boot/sys/boot/i386/libi386/biossmap.c
index e95ea64517..26adef0aa8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/biossmap.c
+++ b/usr/src/boot/sys/boot/i386/libi386/biossmap.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 /*
  * Obtain memory configuration information from the BIOS
@@ -136,7 +135,7 @@ bios_addsmapdata(struct preloaded_file *kfp)
 COMMAND_SET(smap, "smap", "show BIOS SMAP", command_smap);
 
 static int
-command_smap(int argc, char *argv[])
+command_smap(int argc __unused, char *argv[] __unused)
 {
 	u_int			i;
 
diff --git a/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c b/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c
index 641e2733c3..47ccf6722f 100644
--- a/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c
+++ b/usr/src/boot/sys/boot/i386/libi386/elf32_freebsd.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <sys/param.h>
 #include <sys/exec.h>
@@ -78,7 +77,7 @@ elf32_exec(struct preloaded_file *fp)
 }
 
 static int
-elf32_obj_exec(struct preloaded_file *fp)
+elf32_obj_exec(struct preloaded_file *fp __unused)
 {
 	return (EFTYPE);
 }
diff --git a/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c b/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c
index 338a745644..aa2dbb2fd8 100644
--- a/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c
+++ b/usr/src/boot/sys/boot/i386/libi386/elf64_freebsd.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 1998 Michael Smith <msmith@freebsd.org>
  * All rights reserved.
  *
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #define __ELF_WORD_SIZE 64
 #include <sys/param.h>
@@ -120,7 +119,7 @@ elf64_exec(struct preloaded_file *fp)
 }
 
 static int
-elf64_obj_exec(struct preloaded_file *fp)
+elf64_obj_exec(struct preloaded_file *fp __unused)
 {
 	return (EFTYPE);
 }
diff --git a/usr/src/boot/sys/boot/i386/libi386/linux.c b/usr/src/boot/sys/boot/i386/libi386/linux.c
index 685e1a1efc..65fc3e3e98 100644
--- a/usr/src/boot/sys/boot/i386/libi386/linux.c
+++ b/usr/src/boot/sys/boot/i386/libi386/linux.c
@@ -88,7 +88,8 @@ find_real_addr(struct preloaded_file *fp)
 }
 
 static int
-linux_loadkernel(char *filename, uint64_t dest, struct preloaded_file **result)
+linux_loadkernel(char *filename, uint64_t dest __unused,
+    struct preloaded_file **result)
 {
 	struct linux_kernel_header lh;
 	struct preloaded_file *fp;
@@ -408,7 +409,8 @@ linux_exec(struct preloaded_file *fp)
 }
 
 static int
-linux_loadinitrd(char *filename, uint64_t dest, struct preloaded_file **result)
+linux_loadinitrd(char *filename, uint64_t dest __unused,
+    struct preloaded_file **result)
 {
 	struct preloaded_file *mfp;
 
@@ -429,7 +431,7 @@ linux_loadinitrd(char *filename, uint64_t dest, struct preloaded_file **result)
 	return (0);
 }
 
-static int linux_execinitrd(struct preloaded_file *pf)
+static int linux_execinitrd(struct preloaded_file *pf __unused)
 {
 	return (EFTYPE);
 }
diff --git a/usr/src/boot/sys/boot/i386/libi386/multiboot.c b/usr/src/boot/sys/boot/i386/libi386/multiboot.c
index 836b4907a5..0474b62350 100644
--- a/usr/src/boot/sys/boot/i386/libi386/multiboot.c
+++ b/usr/src/boot/sys/boot/i386/libi386/multiboot.c
@@ -527,7 +527,7 @@ multiboot_obj_loadfile(char *filename, u_int64_t dest,
 }
 
 static int
-multiboot_obj_exec(struct preloaded_file *fp)
+multiboot_obj_exec(struct preloaded_file *fp __unused)
 {
 
 	return (EFTYPE);
diff --git a/usr/src/boot/sys/boot/i386/libi386/pxe.c b/usr/src/boot/sys/boot/i386/libi386/pxe.c
index 821d0f627d..8ebd0c9f08 100644
--- a/usr/src/boot/sys/boot/i386/libi386/pxe.c
+++ b/usr/src/boot/sys/boot/i386/libi386/pxe.c
@@ -302,7 +302,7 @@ pxe_cleanup(void)
 }
 
 void
-pxe_perror(int err)
+pxe_perror(int err __unused)
 {
 }
 
@@ -352,14 +352,14 @@ bangpxe_call(int func, void *ptr)
 
 
 static int
-pxe_netif_match(struct netif *nif, void *machdep_hint)
+pxe_netif_match(struct netif *nif __unused, void *machdep_hint __unused)
 {
 	return (1);
 }
 
 
 static int
-pxe_netif_probe(struct netif *nif, void *machdep_hint)
+pxe_netif_probe(struct netif *nif __unused, void *machdep_hint __unused)
 {
 	if (pxe_call == NULL)
 		return (-1);
@@ -368,7 +368,7 @@ pxe_netif_probe(struct netif *nif, void *machdep_hint)
 }
 
 static void
-pxe_netif_end(struct netif *nif)
+pxe_netif_end(struct netif *nif __unused)
 {
 	t_PXENV_UNDI_CLOSE *undi_close_p;
 
@@ -383,7 +383,7 @@ pxe_netif_end(struct netif *nif)
 }
 
 static void
-pxe_netif_init(struct iodesc *desc, void *machdep_hint)
+pxe_netif_init(struct iodesc *desc, void *machdep_hint __unused)
 {
 	t_PXENV_UNDI_GET_INFORMATION *undi_info_p;
 	t_PXENV_UNDI_OPEN *undi_open_p;
@@ -515,7 +515,7 @@ pxe_netif_receive(void **pkt)
 }
 
 static ssize_t
-pxe_netif_get(struct iodesc *desc, void **pkt, time_t timeout)
+pxe_netif_get(struct iodesc *desc __unused, void **pkt, time_t timeout)
 {
 	time_t t;
 	void *ptr;
@@ -533,7 +533,7 @@ pxe_netif_get(struct iodesc *desc, void **pkt, time_t timeout)
 }
 
 static ssize_t
-pxe_netif_put(struct iodesc *desc, void *pkt, size_t len)
+pxe_netif_put(struct iodesc *desc __unused, void *pkt, size_t len)
 {
 	t_PXENV_UNDI_TRANSMIT *trans_p;
 	t_PXENV_UNDI_TBD *tbd_p;
diff --git a/usr/src/boot/sys/boot/i386/libi386/smbios.c b/usr/src/boot/sys/boot/i386/libi386/smbios.c
index 845521dd60..148c6cf1fe 100644
--- a/usr/src/boot/sys/boot/i386/libi386/smbios.c
+++ b/usr/src/boot/sys/boot/i386/libi386/smbios.c
@@ -1,4 +1,4 @@
-/*-
+/*
  * Copyright (c) 2005-2009 Jung-uk Kim <jkim@FreeBSD.org>
  * All rights reserved.
  *
@@ -25,7 +25,6 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
 
 #include <stand.h>
 #include <bootstrap.h>
@@ -213,7 +212,7 @@ smbios_setenv(const char *name, caddr_t addr, const int offset)
 #define	UUID_GET(base, off)	(*(UUID_TYPE *)((base) + (off)))
 
 static void
-smbios_setuuid(const char *name, const caddr_t addr, const int ver)
+smbios_setuuid(const char *name, const caddr_t addr)
 {
 	char		uuid[37];
 	int		byteorder, i, ones, zeros;
@@ -300,7 +299,7 @@ smbios_parse_table(const caddr_t addr)
 		smbios_setenv("smbios.system.version", addr, 0x06);
 #ifdef SMBIOS_SERIAL_NUMBERS
 		smbios_setenv("smbios.system.serial", addr, 0x07);
-		smbios_setuuid("smbios.system.uuid", addr + 0x08, smbios.ver);
+		smbios_setuuid("smbios.system.uuid", addr + 0x08);
 #endif
 		if (smbios.major > 2 ||
 		    (smbios.major == 2 && smbios.minor >= 4)) {
diff --git a/usr/src/boot/sys/boot/i386/loader/main.c b/usr/src/boot/sys/boot/i386/loader/main.c
index 32c3cdef34..58ad05e106 100644
--- a/usr/src/boot/sys/boot/i386/loader/main.c
+++ b/usr/src/boot/sys/boot/i386/loader/main.c
@@ -295,7 +295,7 @@ extract_currdev(void)
 COMMAND_SET(reboot, "reboot", "reboot the system", command_reboot);
 
 static int
-command_reboot(int argc, char *argv[])
+command_reboot(int argc __unused, char *argv[] __unused)
 {
 	int i;
 
@@ -318,7 +318,7 @@ exit(int code)
 COMMAND_SET(heap, "heap", "show heap usage", command_heap);
 
 static int
-command_heap(int argc, char *argv[])
+command_heap(int argc __unused, char *argv[] __unused)
 {
 
 	mallocstats();
diff --git a/usr/src/boot/sys/cddl/boot/zfs/fletcher.c b/usr/src/boot/sys/cddl/boot/zfs/fletcher.c
index ca08e5deae..2aa381a9d9 100644
--- a/usr/src/boot/sys/cddl/boot/zfs/fletcher.c
+++ b/usr/src/boot/sys/cddl/boot/zfs/fletcher.c
@@ -25,7 +25,7 @@
 
 static void
 fletcher_2_native(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	const uint64_t *ip = buf;
 	const uint64_t *ipend = ip + (size / sizeof (uint64_t));
@@ -43,7 +43,7 @@ fletcher_2_native(const void *buf, uint64_t size,
 
 static void
 fletcher_2_byteswap(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	const uint64_t *ip = buf;
 	const uint64_t *ipend = ip + (size / sizeof (uint64_t));
@@ -61,7 +61,7 @@ fletcher_2_byteswap(const void *buf, uint64_t size,
 
 static void
 fletcher_4_native(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	const uint32_t *ip = buf;
 	const uint32_t *ipend = ip + (size / sizeof (uint32_t));
@@ -79,7 +79,7 @@ fletcher_4_native(const void *buf, uint64_t size,
 
 static void
 fletcher_4_byteswap(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	const uint32_t *ip = buf;
 	const uint32_t *ipend = ip + (size / sizeof (uint32_t));
diff --git a/usr/src/boot/sys/cddl/boot/zfs/lzjb.c b/usr/src/boot/sys/cddl/boot/zfs/lzjb.c
index 1283a6c31a..832b1004e2 100644
--- a/usr/src/boot/sys/cddl/boot/zfs/lzjb.c
+++ b/usr/src/boot/sys/cddl/boot/zfs/lzjb.c
@@ -24,8 +24,6 @@
  * Use is subject to license terms.
  */
 
-/*#pragma ident	"%Z%%M%	%I%	%E% SMI"*/
-
 /*
  * We keep our own copy of this algorithm for 2 main reasons:
  * 	1. If we didn't, anyone modifying common/os/compress.c would
@@ -45,7 +43,8 @@
 
 /*ARGSUSED*/
 static int
-lzjb_decompress(void *s_start, void *d_start, size_t s_len, size_t d_len, int n)
+lzjb_decompress(void *s_start, void *d_start, size_t s_len __unused,
+    size_t d_len, int n __unused)
 {
 	unsigned char *src = s_start;
 	unsigned char *dst = d_start;
diff --git a/usr/src/boot/sys/cddl/boot/zfs/sha256.c b/usr/src/boot/sys/cddl/boot/zfs/sha256.c
index 403d110b6f..eee98e612a 100644
--- a/usr/src/boot/sys/cddl/boot/zfs/sha256.c
+++ b/usr/src/boot/sys/cddl/boot/zfs/sha256.c
@@ -287,7 +287,7 @@ SHA512(uint64_t *H, const void *buf, uint64_t size, zio_cksum_t *zcp)
 
 static void
 zio_checksum_SHA256(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	/* SHA-256 as per FIPS 180-4. */
 	uint32_t	H[] = {
@@ -299,7 +299,7 @@ zio_checksum_SHA256(const void *buf, uint64_t size,
 
 static void
 zio_checksum_SHA512_native(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	/* SHA-512/256 as per FIPS 180-4. */
 	uint64_t	H[] = {
diff --git a/usr/src/boot/sys/cddl/boot/zfs/zfssubr.c b/usr/src/boot/sys/cddl/boot/zfs/zfssubr.c
index e5eedcd3a1..3a81418c6a 100644
--- a/usr/src/boot/sys/cddl/boot/zfs/zfssubr.c
+++ b/usr/src/boot/sys/cddl/boot/zfs/zfssubr.c
@@ -61,8 +61,8 @@ zfs_init_crc(void)
 }
 
 static void
-zio_checksum_off(const void *buf, uint64_t size,
-    const void *ctx_template, zio_cksum_t *zcp)
+zio_checksum_off(const void *buf __unused, uint64_t size __unused,
+    const void *ctx_template __unused, zio_cksum_t *zcp)
 {
 	ZIO_SET_CHECKSUM(zcp, 0, 0, 0, 0);
 }
@@ -841,7 +841,7 @@ vdev_raidz_generate_parity(raidz_map_t *rm)
 /* END CSTYLED */
 
 static void
-vdev_raidz_matrix_init(raidz_map_t *rm, int n, int nmap, int *map,
+vdev_raidz_matrix_init(raidz_map_t *rm __unused, int n, int nmap, int *map,
     uint8_t **rows)
 {
 	int i, j;
@@ -1336,7 +1336,7 @@ vdev_child(vdev_t *pvd, uint64_t devidx)
  */
 static int
 raidz_checksum_verify(const spa_t *spa, const blkptr_t *bp, void *data,
-    uint64_t size)
+    uint64_t size __unused)
 {
 
 	return (zio_checksum_verify(spa, bp, data));
@@ -1389,7 +1389,8 @@ raidz_parity_verify(raidz_map_t *rm)
  */
 static int
 vdev_raidz_combrec(const spa_t *spa, raidz_map_t *rm, const blkptr_t *bp,
-    void *data, off_t offset, uint64_t bytes, int total_errors, int data_errors)
+    void *data, off_t offset __unused, uint64_t bytes, int total_errors,
+    int data_errors)
 {
 	raidz_col_t *rc;
 	void *orig[VDEV_RAIDZ_MAXPARITY];