svn commit: r235231 - in head/sys/sparc64: include sparc64

[Marius Strobl]

Author: marius
Date: Thu May 10 15:17:21 2012
New Revision: 235231
URL: http://svn.freebsd.org/changeset/base/235231

Log:
  Merge r234989 from x86:
  
  Revert part of r234723 by re-enabling the SMP protection for intr_bind().

Modified:
  head/sys/sparc64/include/intr_machdep.h
  head/sys/sparc64/sparc64/intr_machdep.c

Modified: head/sys/sparc64/include/intr_machdep.h
==============================================================================
--- head/sys/sparc64/include/intr_machdep.h	Thu May 10 15:16:42 2012	(r235230)
+++ head/sys/sparc64/include/intr_machdep.h	Thu May 10 15:17:21 2012	(r235231)
@@ -91,8 +91,10 @@ struct intr_vector {
 extern ih_func_t *intr_handlers[];
 extern struct intr_vector intr_vectors[];
 
+#ifdef SMP
 void	intr_add_cpu(u_int cpu);
 int	intr_bind(int vec, u_char cpu);
+#endif
 int	intr_describe(int vec, void *ih, const char *descr);
 void	intr_setup(int level, ih_func_t *ihf, int pri, iv_func_t *ivf,
 	    void *iva);

Modified: head/sys/sparc64/sparc64/intr_machdep.c
==============================================================================
--- head/sys/sparc64/sparc64/intr_machdep.c	Thu May 10 15:16:42 2012	(r235230)
+++ head/sys/sparc64/sparc64/intr_machdep.c	Thu May 10 15:17:21 2012	(r235231)
@@ -555,15 +555,6 @@ intr_shuffle_irqs(void *arg __unused)
 SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs,
     NULL);
 #else /* !SMP */
-
-/* Return EOPNOTSUPP in the UP case. */
-int
-intr_bind(int vec __unused, u_char cpu __unused)
-{
-
-	return (EOPNOTSUPP);
-}
-
 /* Use an empty stub for compatibility. */
 void
 intr_add_cpu(u_int cpu __unused)