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

Revert part of r234723 by re-enabling the SMP protection for

Browse Source 
intr_bind() on x86.
This has been requested by jhb and I strongly disagree with this,
but as long as he is the x86 and interrupt subsystem maintainer I will
follow his directives.

The disagreement cames from what we should really consider as a
public KPI. IMHO, if we really need a selection between the kernel
functions, we may need an explicit protection like _KERNEL_KPI, which
defines which subset of the kernel function might really be considered
as part of the KPI (for thirdy part modules) and which not.
As long as we don't have this mechanism I just consider any possible
function as usable by thirdy part code, thus intr_bind() included.

MFC after:	1 week
This commit is contained in:
Attilio Rao 2012-05-03 21:44:01 +00:00
parent 6fcbac3cd5
commit b8be27bf29
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -144,7 +144,9 @@ void intr_add_cpu(u_int cpu);
int intr_add_handler(const char *name, int vector, driver_filter_t filter, int intr_add_handler(const char *name, int vector, driver_filter_t filter,
driver_intr_t handler, void *arg, enum intr_type flags, driver_intr_t handler, void *arg, enum intr_type flags,
void **cookiep); void **cookiep);
#ifdef SMP
int intr_bind(u_int vector, u_char cpu); int intr_bind(u_int vector, u_char cpu);
#endif
int intr_config_intr(int vector, enum intr_trigger trig, int intr_config_intr(int vector, enum intr_trigger trig,
enum intr_polarity pol); enum intr_polarity pol);
int intr_describe(u_int vector, void *ih, const char *descr); int intr_describe(u_int vector, void *ih, const char *descr);

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

@ -134,7 +134,9 @@ void elcr_write_trigger(u_int irq, enum intr_trigger trigger);
void intr_add_cpu(u_int cpu); void intr_add_cpu(u_int cpu);
int intr_add_handler(const char *name, int vector, driver_filter_t filter, int intr_add_handler(const char *name, int vector, driver_filter_t filter,
driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep); driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep);
#ifdef SMP
int intr_bind(u_int vector, u_char cpu); int intr_bind(u_int vector, u_char cpu);
#endif
int intr_config_intr(int vector, enum intr_trigger trig, int intr_config_intr(int vector, enum intr_trigger trig,
enum intr_polarity pol); enum intr_polarity pol);
int intr_describe(u_int vector, void *ih, const char *descr); int intr_describe(u_int vector, void *ih, const char *descr);

8
sys/x86/x86/intr_machdep.c
View File

@ -566,14 +566,6 @@ intr_next_cpu(void)
return (PCPU_GET(apic_id)); return (PCPU_GET(apic_id));
} }
/* Return EOPNOTSUPP in the UP case. */
int
intr_bind(u_int vector __unused, u_char cpu __unused)
{
return (EOPNOTSUPP);
}
/* Use an empty stub for compatibility. */ /* Use an empty stub for compatibility. */
void void
intr_add_cpu(u_int cpu __unused) intr_add_cpu(u_int cpu __unused)