2011-04-04 Joel Sherrill <joel.sherrilL@OARcorp.com>

	PR 1773/cpukit
	* sapi/include/confdefs.h, sapi/src/exinit.c,
	score/include/rtems/bspsmp.h, score/src/percpu.c, score/src/thread.c:
	Rename rtems_smp_maximum_processor to
	rtems_configuration_smp_maximum_processor. Eliminate printk().

6 files changed, 16 insertions, 8 deletions

diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index c197778144..19d38777d5 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,11 @@
+2011-04-04	Joel Sherrill <joel.sherrilL@OARcorp.com>
+
+	PR 1773/cpukit
+	* sapi/include/confdefs.h, sapi/src/exinit.c,
+	score/include/rtems/bspsmp.h, score/src/percpu.c, score/src/thread.c:
+	Rename rtems_smp_maximum_processor to
+	rtems_configuration_smp_maximum_processor. Eliminate printk().
+
 2011-03-24	Ralf Corsépius <ralf.corsepius@rtems.org>
 
 	* include/rtems/bsd/sys/queue.h, include/rtems/bsd/sys/cdefs.h:
diff --git a/cpukit/sapi/include/confdefs.h b/cpukit/sapi/include/confdefs.h
index ad81403430..e7e2a8505d 100644
--- a/cpukit/sapi/include/confdefs.h
+++ b/cpukit/sapi/include/confdefs.h
@@ -2161,9 +2161,10 @@ rtems_fs_init_functions_t    rtems_fs_init_helper =
    *  in an SMP configuration.
    */
   #if defined(CONFIGURE_INIT)
-    uint32_t rtems_smp_maximum_processors = CONFIGURE_SMP_MAXIMUM_PROCESSORS;
+    uint32_t rtems_configuration_smp_maximum_processors = \
+        CONFIGURE_SMP_MAXIMUM_PROCESSORS;
   #else
-    extern uint32_t rtems_smp_maximum_processors;
+    extern uint32_t rtems_configuration_smp_maximum_processors;
   #endif
  /*
   * Instantiate the Per CPU information based upon the user configuration.
diff --git a/cpukit/sapi/src/exinit.c b/cpukit/sapi/src/exinit.c
index a431669641..b63d5e57c4 100644
--- a/cpukit/sapi/src/exinit.c
+++ b/cpukit/sapi/src/exinit.c
@@ -163,7 +163,8 @@ void rtems_initialize_data_structures(void)
    * Discover and initialize the secondary cores in an SMP system.
    */
   #if defined(RTEMS_SMP)
-    _SMP_Processor_count = bsp_smp_initialize( rtems_smp_maximum_processors );
+    _SMP_Processor_count =
+        bsp_smp_initialize( rtems_configuration_smp_maximum_processors );
   #endif
 
   _System_state_Set( SYSTEM_STATE_BEFORE_MULTITASKING );
diff --git a/cpukit/score/include/rtems/bspsmp.h b/cpukit/score/include/rtems/bspsmp.h
index 26da0a7614..da80c38ae8 100644
--- a/cpukit/score/include/rtems/bspsmp.h
+++ b/cpukit/score/include/rtems/bspsmp.h
@@ -87,7 +87,7 @@ SCORE_EXTERN uint32_t _SMP_Processor_count;
  *  This variable is set during the SMP initialization sequence to
  *  indicate the Maximum number of CPUs in this system.
  */
-extern uint32_t rtems_smp_maximum_processors;
+extern uint32_t rtems_configuration_smp_maximum_processors;
  
 /**
  *  @brief Initialize Secondary CPUs
diff --git a/cpukit/score/src/percpu.c b/cpukit/score/src/percpu.c
index 3a6676432b..219dc7ac48 100644
--- a/cpukit/score/src/percpu.c
+++ b/cpukit/score/src/percpu.c
@@ -40,9 +40,7 @@
      */
     size = Configuration.interrupt_stack_size;
     _Per_CPU_Information_p[0] = &_Per_CPU_Information[0];
-    for (cpu=1 ; cpu < rtems_smp_maximum_processors; cpu++ ) {
-
-      printk("Initializing cpu control structure %d\n", cpu );
+    for (cpu=1 ; cpu < rtems_configuration_smp_maximum_processors; cpu++ ) {
 
       Per_CPU_Control *p = &_Per_CPU_Information[cpu];
 
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index 7a0eb38502..3736f6eda8 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -94,7 +94,7 @@ void _Thread_Handler_initialization(void)
    *  coupled multiprocessing system, account for the MPCI Server Thread.
    */
   #if defined(RTEMS_SMP)
-    maximum_internal_threads = rtems_smp_maximum_processors;
+    maximum_internal_threads = rtems_configuration_smp_maximum_processors;
   #else
     maximum_internal_threads = 1;
   #endif