From a6125979d32df275bb88adeb95ec70809ffb43b3 Mon Sep 17 00:00:00 2001 From: Marius Strobl Date: Thu, 10 May 2012 15:17:21 +0000 Subject: [PATCH] Merge r234989 from x86: Revert part of r234723 by re-enabling the SMP protection for intr_bind(). --- sys/sparc64/include/intr_machdep.h | 2 ++ sys/sparc64/sparc64/intr_machdep.c | 9 --------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h index 9319d8c623a..1645fd63d1a 100644 --- a/sys/sparc64/include/intr_machdep.h +++ b/sys/sparc64/include/intr_machdep.h @@ -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); diff --git a/sys/sparc64/sparc64/intr_machdep.c b/sys/sparc64/sparc64/intr_machdep.c index 2a2d33bbe5c..73f9fa61b3e 100644 --- a/sys/sparc64/sparc64/intr_machdep.c +++ b/sys/sparc64/sparc64/intr_machdep.c @@ -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)