diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-05-13 13:37:06 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-05-16 11:44:12 +0200 |
| commit | 6c2eedc7dd86898dceb9bbbe96b02d94cb468e01 (patch) | |
| tree | 59237dda2a2eab59ceb8cc209a45d8c3b635ce09 /c | |
| parent | fstests/fsstatvfs: Fix end of test message (diff) | |
| download | rtems-6c2eedc7dd86898dceb9bbbe96b02d94cb468e01.tar.bz2 | |
smp: Add maximum_processors field to config
Delete rtems_configuration_get_smp_maximum_processors(). Delete
rtems_configuration_smp_maximum_processors variable. Add
maximum_processors field to rtems_configuration_table if RTEMS_SMP is
defined. Add rtems_configuration_get_maximum_processors().
Diffstat (limited to 'c')
| -rw-r--r-- | c/src/lib/libbsp/i386/shared/smp/smp-imps.c | 8 | ||||
| -rw-r--r-- | c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c index f1be625a31..60bb0e613a 100644 --- a/c/src/lib/libbsp/i386/shared/smp/smp-imps.c +++ b/c/src/lib/libbsp/i386/shared/smp/smp-imps.c @@ -401,7 +401,7 @@ imps_read_config_table(unsigned start, int count) while (count-- > 0) { switch (*((unsigned char *)start)) { case IMPS_BCT_PROCESSOR: - if ( imps_num_cpus < rtems_configuration_smp_maximum_processors ) { + if ( imps_num_cpus < rtems_configuration_get_maximum_processors() ) { add_processor((imps_processor *)start); } else imps_num_cpus++; @@ -428,13 +428,13 @@ imps_read_config_table(unsigned start, int count) } start += 8; } - if ( imps_num_cpus > rtems_configuration_smp_maximum_processors ) { + if ( imps_num_cpus > rtems_configuration_get_maximum_processors() ) { printk( "WARNING!! Found more CPUs (%d) than configured for (%d)!!\n", imps_num_cpus - 1, - rtems_configuration_smp_maximum_processors + rtems_configuration_get_maximum_processors() ); - imps_num_cpus = rtems_configuration_smp_maximum_processors; + imps_num_cpus = rtems_configuration_get_maximum_processors(); return; } } diff --git a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c index 1f371bf8ad..a9f4a0eebe 100644 --- a/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c +++ b/c/src/lib/libbsp/sparc/leon3/smp/smp_leon3.c @@ -71,13 +71,13 @@ int bsp_smp_initialize( printk( "Found %d CPUs\n", found_cpus ); #endif - if ( found_cpus > rtems_configuration_smp_maximum_processors ) { + if ( found_cpus > rtems_configuration_get_maximum_processors() ) { printk( "%d CPUs IS MORE THAN CONFIGURED -- ONLY USING %d\n", found_cpus, - rtems_configuration_smp_maximum_processors + rtems_configuration_get_maximum_processors() ); - found_cpus = rtems_configuration_smp_maximum_processors; + found_cpus = rtems_configuration_get_maximum_processors(); } if ( found_cpus == 1 ) |