14 files changed, 17 insertions, 18 deletions

diff --git a/sys/amd64/vmm/vmm_host.h b/sys/amd64/vmm/vmm_host.h
index 95618ff53e6d..e49e44cf1659 100644
--- a/sys/amd64/vmm/vmm_host.h
+++ b/sys/amd64/vmm/vmm_host.h
@@ -30,7 +30,7 @@
 #define	_VMM_HOST_H_
 
 #ifndef	_KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 struct xsave_limits {
diff --git a/sys/cam/cam_compat.h b/sys/cam/cam_compat.h
index 72a3608032ce..a9390873b837 100644
--- a/sys/cam/cam_compat.h
+++ b/sys/cam/cam_compat.h
@@ -31,7 +31,7 @@
 #ifndef _CAM_CAM_COMPAT_H
 #define _CAM_CAM_COMPAT_H
 
-/* No user-servicable parts in here. */
+/* No user-serviceable parts in here. */
 #ifdef _KERNEL
 
 int cam_compat_ioctl(struct cdev *dev, u_long cmd, caddr_t addr, int flag,
diff --git a/sys/cam/cam_iosched.h b/sys/cam/cam_iosched.h
index 34c926d8d4ae..544c9006544e 100644
--- a/sys/cam/cam_iosched.h
+++ b/sys/cam/cam_iosched.h
@@ -31,7 +31,7 @@
 #ifndef _CAM_CAM_IOSCHED_H
 #define _CAM_CAM_IOSCHED_H
 
-/* No user-servicable parts in here. */
+/* No user-serviceable parts in here. */
 #ifdef _KERNEL
 
 /* Forward declare all structs to keep interface thin */
diff --git a/sys/netinet/cc/cc.h b/sys/netinet/cc/cc.h
index 5e61b04bb926..9b6279ded69a 100644
--- a/sys/netinet/cc/cc.h
+++ b/sys/netinet/cc/cc.h
@@ -52,7 +52,7 @@
 #define _NETINET_CC_CC_H_
 
 #if !defined(_KERNEL)
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 /* Global CC vars. */
diff --git a/sys/sys/buf_ring.h b/sys/sys/buf_ring.h
index 234e318ecf16..fcffc17ad462 100644
--- a/sys/sys/buf_ring.h
+++ b/sys/sys/buf_ring.h
@@ -250,16 +250,16 @@ buf_ring_advance_sc(struct buf_ring *br)
 
 /*
  * Used to return a buffer (most likely already there)
- * to the top od the ring. The caller should *not*
+ * to the top of the ring. The caller should *not*
  * have used any dequeue to pull it out of the ring
  * but instead should have used the peek() function.
  * This is normally used where the transmit queue
- * of a driver is full, and an mubf must be returned.
+ * of a driver is full, and an mbuf must be returned.
  * Most likely whats in the ring-buffer is what
  * is being put back (since it was not removed), but
  * sometimes the lower transmit function may have
  * done a pullup or other function that will have
- * changed it. As an optimzation we always put it
+ * changed it. As an optimization we always put it
  * back (since jhb says the store is probably cheaper),
  * if we have to do a multi-queue version we will need
  * the compare and an atomic.
diff --git a/sys/sys/bus.h b/sys/sys/bus.h
index 9e7f0ad5bf09..e9fca9b70cc8 100644
--- a/sys/sys/bus.h
+++ b/sys/sys/bus.h
@@ -662,7 +662,7 @@ void	bus_data_generation_update(void);
  * Some convenience defines for probe routines to return.  These are just
  * suggested values, and there's nothing magical about them.
  * BUS_PROBE_SPECIFIC is for devices that cannot be reprobed, and that no
- * possible other driver may exist (typically legacy drivers who don't fallow
+ * possible other driver may exist (typically legacy drivers who don't follow
  * all the rules, or special needs drivers).  BUS_PROBE_VENDOR is the
  * suggested value that vendor supplied drivers use.  This is for source or
  * binary drivers that are not yet integrated into the FreeBSD tree.  Its use
@@ -675,7 +675,7 @@ void	bus_data_generation_update(void);
  * supports the newer ones would return BUS_PROBE_DEFAULT.  BUS_PROBE_GENERIC
  * is for drivers that wish to have a generic form and a specialized form,
  * like is done with the pci bus and the acpi pci bus.  BUS_PROBE_HOOVER is
- * for those buses that implement a generic device place-holder for devices on
+ * for those buses that implement a generic device placeholder for devices on
  * the bus that have no more specific driver for them (aka ugen).
  * BUS_PROBE_NOWILDCARD or lower means that the device isn't really bidding
  * for a device node, but accepts only devices that its parent has told it
diff --git a/sys/sys/busdma_bufalloc.h b/sys/sys/busdma_bufalloc.h
index dfcb4b8c5ff0..13291a6bf914 100644
--- a/sys/sys/busdma_bufalloc.h
+++ b/sys/sys/busdma_bufalloc.h
@@ -71,7 +71,7 @@ typedef struct busdma_bufalloc *busdma_bufalloc_t;
  * name appears in zone stats as 'dma name nnnnn' where 'dma' is fixed and
  * 'nnnnn' is the size of buffers in that zone.
  *
- * If if the alloc/free function pointers are NULL, the regular uma internal
+ * If the alloc/free function pointers are NULL, the regular uma internal
  * allocators are used (I.E., you get "plain old kernel memory").  On a platform
  * with an exclusion zone that applies to all DMA operations, a custom allocator
  * could be used to ensure no buffer memory is ever allocated from that zone,
@@ -116,4 +116,3 @@ void  busdma_bufalloc_free_uncacheable(void *item, vm_size_t size,
     uint8_t pflag);
 
 #endif	/* _MACHINE_BUSDMA_BUFALLOC_H_ */
-
diff --git a/sys/sys/devmap.h b/sys/sys/devmap.h
index 8380b67a6075..9403e7491acc 100644
--- a/sys/sys/devmap.h
+++ b/sys/sys/devmap.h
@@ -30,7 +30,7 @@
 #define	_SYS_DEVMAP_H_
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 /*
diff --git a/sys/sys/eventvar.h b/sys/sys/eventvar.h
index ce79677f3be6..4721e614f421 100644
--- a/sys/sys/eventvar.h
+++ b/sys/sys/eventvar.h
@@ -30,7 +30,7 @@
 #define _SYS_EVENTVAR_H_
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 #include <sys/_task.h>
diff --git a/sys/sys/gtaskqueue.h b/sys/sys/gtaskqueue.h
index 88d4b54cdbbf..bab8af386b47 100644
--- a/sys/sys/gtaskqueue.h
+++ b/sys/sys/gtaskqueue.h
@@ -32,7 +32,7 @@
 #include <sys/taskqueue.h>
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 struct gtaskqueue;
diff --git a/sys/sys/ksem.h b/sys/sys/ksem.h
index b337a2bfb6fb..be4a90ea62c4 100644
--- a/sys/sys/ksem.h
+++ b/sys/sys/ksem.h
@@ -30,7 +30,7 @@
 #define	_POSIX4_KSEM_H_
 
 #if !defined(_KERNEL) && !defined(_WANT_FILE)
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 #include <sys/condvar.h>
diff --git a/sys/sys/pipe.h b/sys/sys/pipe.h
index ee7c128d249b..2f15ae24bf9e 100644
--- a/sys/sys/pipe.h
+++ b/sys/sys/pipe.h
@@ -25,7 +25,7 @@
 #define _SYS_PIPE_H_
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 /*
diff --git a/sys/sys/sockopt.h b/sys/sys/sockopt.h
index 69d6c6dc2e65..a180009f8bf5 100644
--- a/sys/sys/sockopt.h
+++ b/sys/sys/sockopt.h
@@ -34,7 +34,7 @@
 #define _SYS_SOCKOPT_H_
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 
diff --git a/sys/sys/taskqueue.h b/sys/sys/taskqueue.h
index a6c6655832ec..3cb5427cef56 100644
--- a/sys/sys/taskqueue.h
+++ b/sys/sys/taskqueue.h
@@ -30,7 +30,7 @@
 #define _SYS_TASKQUEUE_H_
 
 #ifndef _KERNEL
-#error "no user-servicable parts inside"
+#error "no user-serviceable parts inside"
 #endif
 
 #include <sys/queue.h>