diff options
author | marius <marius@FreeBSD.org> | 2012-05-10 15:17:21 +0000 |
---|---|---|
committer | marius <marius@FreeBSD.org> | 2012-05-10 15:17:21 +0000 |
commit | d42dce6416c614b6dc3f38b66634fb892e809b1a (patch) | |
tree | 7441adcdb6ed4351e6f0c3f6f9498ed42c3d6473 | |
parent | 323d529ebe7c330677f5e4d24d72dec572424b4c (diff) | |
download | FreeBSD-src-d42dce6416c614b6dc3f38b66634fb892e809b1a.zip FreeBSD-src-d42dce6416c614b6dc3f38b66634fb892e809b1a.tar.gz |
Merge r234989 from x86:
Revert part of r234723 by re-enabling the SMP protection for intr_bind().
-rw-r--r-- | sys/sparc64/include/intr_machdep.h | 2 | ||||
-rw-r--r-- | 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 9319d8c..1645fd6 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 2a2d33b..73f9fa6 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) |