diff options
author | attilio <attilio@FreeBSD.org> | 2012-10-09 12:22:43 +0000 |
---|---|---|
committer | attilio <attilio@FreeBSD.org> | 2012-10-09 12:22:43 +0000 |
commit | 3212891c92af5f2d7d3d162066a3fc5b39195996 (patch) | |
tree | c05b3d1bedc331d22044ddd50f075c6b6a619735 /sys/sparc64 | |
parent | 8747a46991f804159ec832961138fbafc8489e41 (diff) | |
download | FreeBSD-src-3212891c92af5f2d7d3d162066a3fc5b39195996.zip FreeBSD-src-3212891c92af5f2d7d3d162066a3fc5b39195996.tar.gz |
Reverts r234074,234105,234564,234723,234989,235231-235232 and part of
r234247.
Use, instead, the static intializer introduced in r239923 for x86 and
sparc64 intr_cpus, unwinding the code to the initial version.
Reviewed by: marius
Diffstat (limited to 'sys/sparc64')
-rw-r--r-- | sys/sparc64/include/intr_machdep.h | 4 | ||||
-rw-r--r-- | sys/sparc64/sparc64/intr_machdep.c | 9 | ||||
-rw-r--r-- | sys/sparc64/sparc64/machdep.c | 5 |
3 files changed, 3 insertions, 15 deletions
diff --git a/sys/sparc64/include/intr_machdep.h b/sys/sparc64/include/intr_machdep.h index 6803fc62..6e472f7 100644 --- a/sys/sparc64/include/intr_machdep.h +++ b/sys/sparc64/include/intr_machdep.h @@ -91,10 +91,10 @@ struct intr_vector { extern ih_func_t *intr_handlers[]; extern struct intr_vector intr_vectors[]; -void intr_add_cpu(u_int cpu); #ifdef SMP -int intr_bind(int vec, u_char cpu); +void intr_add_cpu(u_int cpu); #endif +int intr_bind(int vec, u_char cpu); 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 73f9fa6..f8eb6d8 100644 --- a/sys/sparc64/sparc64/intr_machdep.c +++ b/sys/sparc64/sparc64/intr_machdep.c @@ -456,7 +456,7 @@ intr_describe(int vec, void *ih, const char *descr) * allocate CPUs round-robin. */ -static cpuset_t intr_cpus; +static cpuset_t intr_cpus = CPUSET_T_INITIALIZER(0x1); static int current_cpu; static void @@ -554,11 +554,4 @@ intr_shuffle_irqs(void *arg __unused) } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL); -#else /* !SMP */ -/* Use an empty stub for compatibility. */ -void -intr_add_cpu(u_int cpu __unused) -{ - -} #endif diff --git a/sys/sparc64/sparc64/machdep.c b/sys/sparc64/sparc64/machdep.c index 63be007..7c7c234 100644 --- a/sys/sparc64/sparc64/machdep.c +++ b/sys/sparc64/sparc64/machdep.c @@ -196,11 +196,6 @@ cpu_startup(void *arg) printf("machine: %s\n", sparc64_model); cpu_identify(rdpr(ver), PCPU_GET(clock), curcpu); - - /* - * Add BSP as an interrupt target. - */ - intr_add_cpu(0); } void |