svn commit: r218499 - in projects/ofed/head/sys: kern ofed/include/linux sys

[Jeff Roberson]

Author: jeff
Date: Thu Feb 10 00:01:10 2011
New Revision: 218499
URL: http://svn.freebsd.org/changeset/base/218499

Log:
   - Slightly obscure and comment intr_drain() so that it is clear that it
     is not part of the official BSD api and only exists for linux compat.

Modified:
  projects/ofed/head/sys/kern/kern_intr.c
  projects/ofed/head/sys/ofed/include/linux/hardirq.h
  projects/ofed/head/sys/sys/interrupt.h

Modified: projects/ofed/head/sys/kern/kern_intr.c
==============================================================================
--- projects/ofed/head/sys/kern/kern_intr.c	Wed Feb  9 23:59:17 2011	(r218498)
+++ projects/ofed/head/sys/kern/kern_intr.c	Thu Feb 10 00:01:10 2011	(r218499)
@@ -744,10 +744,11 @@ intr_handler_source(void *cookie)
  * Sleep until an ithread finishes executing an interrupt handler.
  *
  * XXX Doesn't currently handle interrupt filters or fast interrupt
- * handlers.
+ * handlers.  This is intended for compatibility with linux drivers
+ * only.  Do not use in BSD code.
  */
 void
-intr_drain(int irq)
+_intr_drain(int irq)
 {
 	struct mtx *mtx;
 	struct intr_event *ie;

Modified: projects/ofed/head/sys/ofed/include/linux/hardirq.h
==============================================================================
--- projects/ofed/head/sys/ofed/include/linux/hardirq.h	Wed Feb  9 23:59:17 2011	(r218498)
+++ projects/ofed/head/sys/ofed/include/linux/hardirq.h	Thu Feb 10 00:01:10 2011	(r218499)
@@ -34,6 +34,6 @@
 #include <sys/bus.h>
 #include <sys/interrupt.h>
 
-#define	synchronize_irq(irq)	intr_drain((irq))
+#define	synchronize_irq(irq)	_intr_drain((irq))
 
 #endif	/* _LINUX_HARDIRQ_H_ */

Modified: projects/ofed/head/sys/sys/interrupt.h
==============================================================================
--- projects/ofed/head/sys/sys/interrupt.h	Wed Feb  9 23:59:17 2011	(r218498)
+++ projects/ofed/head/sys/sys/interrupt.h	Thu Feb 10 00:01:10 2011	(r218499)
@@ -176,7 +176,7 @@ int	intr_event_remove_handler(void *cook
 int	intr_getaffinity(int irq, void *mask);
 void	*intr_handler_source(void *cookie);
 int	intr_setaffinity(int irq, void *mask);
-void	intr_drain(int irq);
+void	_intr_drain(int irq);  /* Linux compat only. */
 int	swi_add(struct intr_event **eventp, const char *name,
 	    driver_intr_t handler, void *arg, int pri, enum intr_type flags,
 	    void **cookiep);