From owner-svn-src-head@FreeBSD.ORG  Thu May 10 15:23:20 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DF649106564A;
	Thu, 10 May 2012 15:23:20 +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 C86778FC0C;
	Thu, 10 May 2012 15:23:20 +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 q4AFNKmV040928;
	Thu, 10 May 2012 15:23:20 GMT (envelope-from marius@svn.freebsd.org)
Received: (from marius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4AFNKa2040926;
	Thu, 10 May 2012 15:23:20 GMT (envelope-from marius@svn.freebsd.org)
Message-Id: <201205101523.q4AFNKa2040926@svn.freebsd.org>
From: Marius Strobl <marius@FreeBSD.org>
Date: Thu, 10 May 2012 15:23:20 +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: r235232 - head/sys/sparc64/include
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:23:21 -0000

Author: marius
Date: Thu May 10 15:23:20 2012
New Revision: 235232
URL: http://svn.freebsd.org/changeset/base/235232

Log:
  Fix mismerge in r235231.

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

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