diff --git a/sys/amd64/isa/intr_machdep.c b/sys/amd64/isa/intr_machdep.c
index d1f46ca4d8c..f9eb11be820 100644
--- a/sys/amd64/isa/intr_machdep.c
+++ b/sys/amd64/isa/intr_machdep.c
@@ -723,6 +723,9 @@ add_intrdesc(intrec *idesc)
  * Add the interrupt handler descriptor data structure created by an
  * earlier call of create_intr() to the linked list for its irq and
  * adjust the interrupt masks if necessary.
+ *
+ * WARNING: This is an internal function and not to be used by device
+ * drivers.  It is subject to change without notice.
  */
 
 intrec *
diff --git a/sys/amd64/isa/intr_machdep.h b/sys/amd64/isa/intr_machdep.h
index cc6ca67a323..5982295b1ab 100644
--- a/sys/amd64/isa/intr_machdep.h
+++ b/sys/amd64/isa/intr_machdep.h
@@ -201,6 +201,11 @@ intrmask_t splq __P((intrmask_t mask));
 
 #define	INTR_FAST		0x00000001 /* fast interrupt handler */
 #define INTR_EXCL		0x00010000 /* excl. intr, default is shared */
+
+/*
+ * WARNING: These are internal functions and not to be used by device drivers!
+ * They are subject to change without notice. 
+ */
 struct intrec *inthand_add(const char *name, int irq, inthand2_t handler,
 			   void *arg, intrmask_t *maskptr, int flags);
 
diff --git a/sys/amd64/isa/nmi.c b/sys/amd64/isa/nmi.c
index d1f46ca4d8c..f9eb11be820 100644
--- a/sys/amd64/isa/nmi.c
+++ b/sys/amd64/isa/nmi.c
@@ -723,6 +723,9 @@ add_intrdesc(intrec *idesc)
  * Add the interrupt handler descriptor data structure created by an
  * earlier call of create_intr() to the linked list for its irq and
  * adjust the interrupt masks if necessary.
+ *
+ * WARNING: This is an internal function and not to be used by device
+ * drivers.  It is subject to change without notice.
  */
 
 intrec *
diff --git a/sys/i386/isa/intr_machdep.c b/sys/i386/isa/intr_machdep.c
index d1f46ca4d8c..f9eb11be820 100644
--- a/sys/i386/isa/intr_machdep.c
+++ b/sys/i386/isa/intr_machdep.c
@@ -723,6 +723,9 @@ add_intrdesc(intrec *idesc)
  * Add the interrupt handler descriptor data structure created by an
  * earlier call of create_intr() to the linked list for its irq and
  * adjust the interrupt masks if necessary.
+ *
+ * WARNING: This is an internal function and not to be used by device
+ * drivers.  It is subject to change without notice.
  */
 
 intrec *
diff --git a/sys/i386/isa/intr_machdep.h b/sys/i386/isa/intr_machdep.h
index cc6ca67a323..5982295b1ab 100644
--- a/sys/i386/isa/intr_machdep.h
+++ b/sys/i386/isa/intr_machdep.h
@@ -201,6 +201,11 @@ intrmask_t splq __P((intrmask_t mask));
 
 #define	INTR_FAST		0x00000001 /* fast interrupt handler */
 #define INTR_EXCL		0x00010000 /* excl. intr, default is shared */
+
+/*
+ * WARNING: These are internal functions and not to be used by device drivers!
+ * They are subject to change without notice. 
+ */
 struct intrec *inthand_add(const char *name, int irq, inthand2_t handler,
 			   void *arg, intrmask_t *maskptr, int flags);
 
diff --git a/sys/i386/isa/nmi.c b/sys/i386/isa/nmi.c
index d1f46ca4d8c..f9eb11be820 100644
--- a/sys/i386/isa/nmi.c
+++ b/sys/i386/isa/nmi.c
@@ -723,6 +723,9 @@ add_intrdesc(intrec *idesc)
  * Add the interrupt handler descriptor data structure created by an
  * earlier call of create_intr() to the linked list for its irq and
  * adjust the interrupt masks if necessary.
+ *
+ * WARNING: This is an internal function and not to be used by device
+ * drivers.  It is subject to change without notice.
  */
 
 intrec *