From owner-svn-src-head@FreeBSD.ORG  Thu May 10 15:17:22 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 2FD1B1065687;
	Thu, 10 May 2012 15:17:22 +0000 (UTC)
	(envelope-from marius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1B6748FC0A;
	Thu, 10 May 2012 15:17:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4AFHL5a040694;
	Thu, 10 May 2012 15:17:21 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4AFHLAl040691;
	Thu, 10 May 2012 15:17:21 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201205101517.q4AFHLAl040691@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 10 May 2012 15:17:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235231 - in head/sys/sparc64: include sparc64
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 May 2012 15:17:22 -0000

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)