d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge r234989 from x86:

Browse Source 
Revert part of r234723 by re-enabling the SMP protection for intr_bind().
This commit is contained in:
marius 2012-05-10 15:17:21 +00:00
parent 323d529ebe
commit d42dce6416
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/sparc64/include/intr_machdep.h
View File

@ -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);

9
sys/sparc64/sparc64/intr_machdep.c
View File

@ -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)