Date: Thu, 10 May 2012 15:23:20 +0000 (UTC) From: Marius Strobl <marius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r235232 - head/sys/sparc64/include Message-ID: <201205101523.q4AFNKa2040926@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201205101523.q4AFNKa2040926>