diff options
| author | ps <ps@FreeBSD.org> | 2000-09-22 23:40:10 +0000 |
|---|---|---|
| committer | ps <ps@FreeBSD.org> | 2000-09-22 23:40:10 +0000 |
| commit | ab88cc6719e2d569d7f78bc2fdf7925513a538c8 (patch) | |
| tree | 076030806da9ece11ea86aef58f1ac0c4fdd36c0 /sys/sys/smp.h | |
| parent | 9b419172b9371a7c431182f07664221bdc4cf735 (diff) | |
| download | FreeBSD-src-ab88cc6719e2d569d7f78bc2fdf7925513a538c8.zip FreeBSD-src-ab88cc6719e2d569d7f78bc2fdf7925513a538c8.tar.gz | |
Remove the NCPU, NAPIC, NBUS, NINTR config options. Make NAPIC,
NBUS, NINTR dynamic and set NCPU to a maximum of 16 under SMP.
Reviewed by: peter
Diffstat (limited to 'sys/sys/smp.h')
| -rw-r--r-- | sys/sys/smp.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/sys/sys/smp.h b/sys/sys/smp.h index 425dac0..dab3611 100644 --- a/sys/sys/smp.h +++ b/sys/sys/smp.h @@ -22,16 +22,15 @@ # error APIC_IO required for SMP, add "options APIC_IO" to your config file. #endif /* SMP && !APIC_IO */ -/* Number of CPUs. */ -#if defined(SMP) && !defined(NCPU) -# define NCPU 2 -#endif /* SMP && NCPU */ - -/* Number of IO APICs. */ -#if defined(APIC_IO) && !defined(NAPIC) -# define NAPIC 2 -#endif /* SMP && NAPIC */ - +/* + * Maximum number of CPUs we will use. + * In the !SMP case we save ourselves a litle space. + */ +#if defined(SMP) +# define MAXCPU 16 +#else +# define MAXCPU 1 +#endif /* SMP */ #if defined(SMP) || defined(APIC_IO) @@ -85,7 +84,7 @@ extern int boot_cpu_id; extern vm_offset_t cpu_apic_address; extern vm_offset_t io_apic_address[]; extern u_int32_t cpu_apic_versions[]; -extern u_int32_t io_apic_versions[]; +extern u_int32_t *io_apic_versions; extern int cpu_num_to_apic_id[]; extern int io_num_to_apic_id[]; extern int apic_id_to_logical[]; @@ -142,7 +141,7 @@ void smp_rendezvous __P((void (*)(void *), /* global data in mpapic.c */ extern volatile lapic_t lapic; -extern volatile ioapic_t *ioapic[]; +extern volatile ioapic_t **ioapic; /* functions in mpapic.c */ void apic_dump __P((char*)); |
