2007-10-26 Joel Sherrill <joel.sherrill@OARcorp.com>

	* itron/src/can_wup.c, itron/src/chg_pri.c, itron/src/del_mbf.c,
	itron/src/del_mbx.c, itron/src/del_sem.c, itron/src/del_tsk.c,
	itron/src/frsm_tsk.c, itron/src/ref_mbf.c, itron/src/ref_mbx.c,
	itron/src/ref_sem.c, itron/src/ref_tsk.c, itron/src/rel_wai.c,
	itron/src/rsm_tsk.c, itron/src/sig_sem.c, itron/src/snd_mbx.c,
	itron/src/sta_tsk.c, itron/src/sus_tsk.c, itron/src/ter_tsk.c,
	itron/src/trcv_mbf.c, itron/src/trcv_mbx.c, itron/src/tsnd_mbf.c,
	itron/src/twai_sem.c, posix/src/cancel.c, posix/src/conddestroy.c,
	posix/src/condinit.c, posix/src/condsignalsupp.c,
	posix/src/condwaitsupp.c, posix/src/keydelete.c,
	posix/src/keygetspecific.c, posix/src/keysetspecific.c,
	posix/src/mqueueclose.c, posix/src/mqueuegetattr.c,
	posix/src/mqueuenotify.c, posix/src/mqueuerecvsupp.c,
	posix/src/mqueuesendsupp.c, posix/src/mqueuesetattr.c,
	posix/src/mutexdestroy.c, posix/src/mutexgetprioceiling.c,
	posix/src/mutexinit.c, posix/src/mutexlocksupp.c,
	posix/src/mutexsetprioceiling.c, posix/src/mutexunlock.c,
	posix/src/pbarrierdestroy.c, posix/src/pbarrierwait.c,
	posix/src/prwlockdestroy.c, posix/src/prwlockrdlock.c,
	posix/src/prwlocktimedrdlock.c, posix/src/prwlocktimedwrlock.c,
	posix/src/prwlocktryrdlock.c, posix/src/prwlocktrywrlock.c,
	posix/src/prwlockunlock.c, posix/src/prwlockwrlock.c,
	posix/src/pspindestroy.c, posix/src/pspinlock.c,
	posix/src/pspintrylock.c, posix/src/pspinunlock.c,
	posix/src/pthreaddetach.c, posix/src/pthreadequal.c,
	posix/src/pthreadgetschedparam.c, posix/src/pthreadjoin.c,
	posix/src/pthreadkill.c, posix/src/pthreadsetschedparam.c,
	posix/src/ptimer1.c, posix/src/semaphorewaitsupp.c,
	posix/src/semclose.c, posix/src/semdestroy.c,
	posix/src/semgetvalue.c, posix/src/sempost.c, posix/src/types.c,
	rtems/src/barrierdelete.c, rtems/src/barrierrelease.c,
	rtems/src/barrierwait.c, rtems/src/dpmemdelete.c,
	rtems/src/dpmemexternal2internal.c,
	rtems/src/dpmeminternal2external.c, rtems/src/eventsend.c,
	rtems/src/eventtimeout.c, rtems/src/msgqbroadcast.c,
	rtems/src/msgqdelete.c, rtems/src/msgqflush.c,
	rtems/src/msgqgetnumberpending.c, rtems/src/msgqreceive.c,
	rtems/src/msgqsend.c, rtems/src/msgqurgent.c, rtems/src/partdelete.c,
	rtems/src/partgetbuffer.c, rtems/src/partreturnbuffer.c,
	rtems/src/ratemoncancel.c, rtems/src/ratemondelete.c,
	rtems/src/ratemongetstatistics.c, rtems/src/ratemongetstatus.c,
	rtems/src/ratemonperiod.c, rtems/src/ratemonresetstatistics.c,
	rtems/src/ratemontimeout.c, rtems/src/regiondelete.c,
	rtems/src/regionextend.c, rtems/src/regiongetfreeinfo.c,
	rtems/src/regiongetinfo.c, rtems/src/regiongetsegment.c,
	rtems/src/regiongetsegmentsize.c, rtems/src/regionresizesegment.c,
	rtems/src/regionreturnsegment.c, rtems/src/semdelete.c,
	rtems/src/semflush.c, rtems/src/semobtain.c, rtems/src/semrelease.c,
	rtems/src/signalsend.c, rtems/src/taskdelete.c,
	rtems/src/taskgetnote.c, rtems/src/taskissuspended.c,
	rtems/src/taskrestart.c, rtems/src/taskresume.c,
	rtems/src/tasksetnote.c, rtems/src/tasksetpriority.c,
	rtems/src/taskstart.c, rtems/src/tasksuspend.c,
	rtems/src/taskvariableadd.c, rtems/src/taskvariabledelete.c,
	rtems/src/taskvariableget.c, rtems/src/timercancel.c,
	rtems/src/timerdelete.c, rtems/src/timerfireafter.c,
	rtems/src/timerfirewhen.c, rtems/src/timergetinfo.c,
	rtems/src/timerreset.c, rtems/src/timerserverfireafter.c,
	rtems/src/timerserverfirewhen.c, sapi/src/extensiondelete.c,
	score/include/rtems/score/object.h, score/src/corerwlocktimeout.c,
	score/src/mpci.c, score/src/objectgetnameasstring.c,
	score/src/threaddelayended.c, score/src/threadqtimeout.c: When
	multiprocessing is disabled, do not even allow the constant
	OBJECTS_REMOTE to appear in the source. Even at -O2, the presence of
	a case OBJECTS_REMOTE in each id->pointer _Objects_Get switch results
	in the generation of binary code which can NOT be reached.

58 files changed, 143 insertions, 87 deletions

diff --git a/cpukit/rtems/src/barrierdelete.c b/cpukit/rtems/src/barrierdelete.c
index 6b2a59b0cf..658820969d 100644
--- a/cpukit/rtems/src/barrierdelete.c
+++ b/cpukit/rtems/src/barrierdelete.c
@@ -1,7 +1,7 @@
 /*
  *  Barrier Manager -- Delete a Barrier
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -48,7 +48,9 @@ rtems_status_code rtems_barrier_delete(
   the_barrier = _Barrier_Get( id, &location );
   switch ( location ) {
 
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:
+#endif
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
 
diff --git a/cpukit/rtems/src/barrierrelease.c b/cpukit/rtems/src/barrierrelease.c
index b4dce1ec0d..2dfc441da3 100644
--- a/cpukit/rtems/src/barrierrelease.c
+++ b/cpukit/rtems/src/barrierrelease.c
@@ -1,7 +1,7 @@
 /*
  *  Barrier Manager -- Release Tasks Waitng at a Barrier
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -50,7 +50,9 @@ rtems_status_code rtems_barrier_release(
 
   the_barrier = _Barrier_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:
+#endif
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
 
diff --git a/cpukit/rtems/src/barrierwait.c b/cpukit/rtems/src/barrierwait.c
index 5f282552ae..6a3fcb3103 100644
--- a/cpukit/rtems/src/barrierwait.c
+++ b/cpukit/rtems/src/barrierwait.c
@@ -1,7 +1,7 @@
 /*
  *  Barrier Manager -- Wait at a Barrier
  *
- *  COPYRIGHT (c) 1989-2006.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -46,7 +46,9 @@ rtems_status_code rtems_barrier_wait(
 
   the_barrier = _Barrier_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:
+#endif
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
 
diff --git a/cpukit/rtems/src/dpmemdelete.c b/cpukit/rtems/src/dpmemdelete.c
index b2cf5015bd..91fe812132 100644
--- a/cpukit/rtems/src/dpmemdelete.c
+++ b/cpukit/rtems/src/dpmemdelete.c
@@ -1,7 +1,7 @@
 /*
  *  Dual Port Memory Manager
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -48,8 +48,10 @@ rtems_status_code rtems_port_delete(
 
   the_port = _Dual_ported_memory_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/dpmemexternal2internal.c b/cpukit/rtems/src/dpmemexternal2internal.c
index 5ec6f16745..512d2ec32d 100644
--- a/cpukit/rtems/src/dpmemexternal2internal.c
+++ b/cpukit/rtems/src/dpmemexternal2internal.c
@@ -1,7 +1,7 @@
 /*
  *  Dual Port Memory Manager
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -58,8 +58,10 @@ rtems_status_code rtems_port_external_to_internal(
 
   the_port = _Dual_ported_memory_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/dpmeminternal2external.c b/cpukit/rtems/src/dpmeminternal2external.c
index d643de478a..0f048cb97e 100644
--- a/cpukit/rtems/src/dpmeminternal2external.c
+++ b/cpukit/rtems/src/dpmeminternal2external.c
@@ -1,7 +1,7 @@
 /*
  *  Dual Port Memory Manager
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -58,8 +58,10 @@ rtems_status_code rtems_port_internal_to_external(
 
   the_port = _Dual_ported_memory_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/eventsend.c b/cpukit/rtems/src/eventsend.c
index 90eed2207f..1f913e27ea 100644
--- a/cpukit/rtems/src/eventsend.c
+++ b/cpukit/rtems/src/eventsend.c
@@ -1,7 +1,7 @@
 /*
  *  Event Manager
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -51,8 +51,8 @@ rtems_status_code rtems_event_send(
 
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return(
         _Event_MP_Send_request_packet(
           EVENT_MP_SEND_REQUEST,
diff --git a/cpukit/rtems/src/eventtimeout.c b/cpukit/rtems/src/eventtimeout.c
index c21727f248..75c0e487db 100644
--- a/cpukit/rtems/src/eventtimeout.c
+++ b/cpukit/rtems/src/eventtimeout.c
@@ -1,7 +1,7 @@
 /*
  *  Event Manager
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -49,7 +49,9 @@ void _Event_Timeout(
 
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:  /* impossible */
+#endif
     case OBJECTS_ERROR:
       break;
     case OBJECTS_LOCAL:
diff --git a/cpukit/rtems/src/msgqbroadcast.c b/cpukit/rtems/src/msgqbroadcast.c
index 9cda6a8fde..4b9304991b 100644
--- a/cpukit/rtems/src/msgqbroadcast.c
+++ b/cpukit/rtems/src/msgqbroadcast.c
@@ -2,7 +2,7 @@
  *  Message Queue Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -72,8 +72,8 @@ rtems_status_code rtems_message_queue_broadcast(
 
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = count;
 
       return
diff --git a/cpukit/rtems/src/msgqdelete.c b/cpukit/rtems/src/msgqdelete.c
index 4875578946..a43027f343 100644
--- a/cpukit/rtems/src/msgqdelete.c
+++ b/cpukit/rtems/src/msgqdelete.c
@@ -2,7 +2,7 @@
  *  Message Queue Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -59,8 +59,8 @@ rtems_status_code rtems_message_queue_delete(
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/msgqflush.c b/cpukit/rtems/src/msgqflush.c
index 2132725f30..a1eed21779 100644
--- a/cpukit/rtems/src/msgqflush.c
+++ b/cpukit/rtems/src/msgqflush.c
@@ -2,7 +2,7 @@
  *  Message Queue Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -65,8 +65,8 @@ rtems_status_code rtems_message_queue_flush(
 
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = count;
 
       return
diff --git a/cpukit/rtems/src/msgqgetnumberpending.c b/cpukit/rtems/src/msgqgetnumberpending.c
index 682f94837d..33e2b912e5 100644
--- a/cpukit/rtems/src/msgqgetnumberpending.c
+++ b/cpukit/rtems/src/msgqgetnumberpending.c
@@ -2,7 +2,7 @@
  *  Message Queue Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -63,8 +63,8 @@ rtems_status_code rtems_message_queue_get_number_pending(
 
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = count;
 
       return _Message_queue_MP_Send_request_packet(
diff --git a/cpukit/rtems/src/msgqreceive.c b/cpukit/rtems/src/msgqreceive.c
index 1803081339..83e8758fef 100644
--- a/cpukit/rtems/src/msgqreceive.c
+++ b/cpukit/rtems/src/msgqreceive.c
@@ -2,7 +2,7 @@
  *  Message Queue Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -74,8 +74,8 @@ rtems_status_code rtems_message_queue_receive(
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Message_queue_MP_Send_request_packet(
           MESSAGE_QUEUE_MP_RECEIVE_REQUEST,
           id,
diff --git a/cpukit/rtems/src/msgqsend.c b/cpukit/rtems/src/msgqsend.c
index a52f05273b..f81c8f1dab 100644
--- a/cpukit/rtems/src/msgqsend.c
+++ b/cpukit/rtems/src/msgqsend.c
@@ -72,8 +72,8 @@ rtems_status_code rtems_message_queue_send(
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location )
   {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Message_queue_MP_Send_request_packet(
         MESSAGE_QUEUE_MP_SEND_REQUEST,
         id,
diff --git a/cpukit/rtems/src/msgqurgent.c b/cpukit/rtems/src/msgqurgent.c
index d509129507..93a5376eff 100644
--- a/cpukit/rtems/src/msgqurgent.c
+++ b/cpukit/rtems/src/msgqurgent.c
@@ -72,8 +72,8 @@ rtems_status_code rtems_message_queue_urgent(
   the_message_queue = _Message_queue_Get( id, &location );
   switch ( location )
   {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Message_queue_MP_Send_request_packet(
         MESSAGE_QUEUE_MP_URGENT_REQUEST,
         id,
diff --git a/cpukit/rtems/src/partdelete.c b/cpukit/rtems/src/partdelete.c
index a55c609711..3ee4734615 100644
--- a/cpukit/rtems/src/partdelete.c
+++ b/cpukit/rtems/src/partdelete.c
@@ -2,7 +2,7 @@
  *  Partition Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -50,8 +50,8 @@ rtems_status_code rtems_partition_delete(
 
   the_partition = _Partition_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/partgetbuffer.c b/cpukit/rtems/src/partgetbuffer.c
index 90dd726ecd..85298ff2dd 100644
--- a/cpukit/rtems/src/partgetbuffer.c
+++ b/cpukit/rtems/src/partgetbuffer.c
@@ -2,7 +2,7 @@
  *  Partition Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -55,8 +55,8 @@ rtems_status_code rtems_partition_get_buffer(
 
   the_partition = _Partition_Get( id, &location );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = buffer;
       return(
         _Partition_MP_Send_request_packet(
diff --git a/cpukit/rtems/src/partreturnbuffer.c b/cpukit/rtems/src/partreturnbuffer.c
index 9e304b4d95..916e1a3dc1 100644
--- a/cpukit/rtems/src/partreturnbuffer.c
+++ b/cpukit/rtems/src/partreturnbuffer.c
@@ -2,7 +2,7 @@
  *  Partition Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -52,8 +52,8 @@ rtems_status_code rtems_partition_return_buffer(
   the_partition = _Partition_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Partition_MP_Send_request_packet(
           PARTITION_MP_RETURN_BUFFER_REQUEST,
           id,
diff --git a/cpukit/rtems/src/ratemoncancel.c b/cpukit/rtems/src/ratemoncancel.c
index fff77eb448..396fd79f32 100644
--- a/cpukit/rtems/src/ratemoncancel.c
+++ b/cpukit/rtems/src/ratemoncancel.c
@@ -46,8 +46,10 @@ rtems_status_code rtems_rate_monotonic_cancel(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:
       return RTEMS_INTERNAL_ERROR;  /* should never return this */
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemondelete.c b/cpukit/rtems/src/ratemondelete.c
index 7eeabb2415..73292389cb 100644
--- a/cpukit/rtems/src/ratemondelete.c
+++ b/cpukit/rtems/src/ratemondelete.c
@@ -46,8 +46,10 @@ rtems_status_code rtems_rate_monotonic_delete(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemongetstatistics.c b/cpukit/rtems/src/ratemongetstatistics.c
index aae74b0328..43454806d6 100644
--- a/cpukit/rtems/src/ratemongetstatistics.c
+++ b/cpukit/rtems/src/ratemongetstatistics.c
@@ -53,8 +53,10 @@ rtems_status_code rtems_rate_monotonic_get_statistics(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemongetstatus.c b/cpukit/rtems/src/ratemongetstatus.c
index d46b133e73..5d9b7075ac 100644
--- a/cpukit/rtems/src/ratemongetstatus.c
+++ b/cpukit/rtems/src/ratemongetstatus.c
@@ -58,8 +58,10 @@ rtems_status_code rtems_rate_monotonic_get_status(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemonperiod.c b/cpukit/rtems/src/ratemonperiod.c
index 8d0dca13d2..099c9fedde 100644
--- a/cpukit/rtems/src/ratemonperiod.c
+++ b/cpukit/rtems/src/ratemonperiod.c
@@ -184,8 +184,10 @@ rtems_status_code rtems_rate_monotonic_period(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemonresetstatistics.c b/cpukit/rtems/src/ratemonresetstatistics.c
index 6d8f9c5e11..fc5cbb34c9 100644
--- a/cpukit/rtems/src/ratemonresetstatistics.c
+++ b/cpukit/rtems/src/ratemonresetstatistics.c
@@ -48,8 +48,10 @@ rtems_status_code rtems_rate_monotonic_reset_statistics(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/ratemontimeout.c b/cpukit/rtems/src/ratemontimeout.c
index f861774f98..8f41dc5094 100644
--- a/cpukit/rtems/src/ratemontimeout.c
+++ b/cpukit/rtems/src/ratemontimeout.c
@@ -54,7 +54,9 @@ void _Rate_monotonic_Timeout(
 
   the_period = _Rate_monotonic_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:  /* impossible */
+#endif
     case OBJECTS_ERROR:
       break;
 
diff --git a/cpukit/rtems/src/regiondelete.c b/cpukit/rtems/src/regiondelete.c
index 61409aa229..6788282750 100644
--- a/cpukit/rtems/src/regiondelete.c
+++ b/cpukit/rtems/src/regiondelete.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -52,9 +52,11 @@ rtems_status_code rtems_region_delete(
   _RTEMS_Lock_allocator();
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regionextend.c b/cpukit/rtems/src/regionextend.c
index 25883e4c28..66e9fea936 100644
--- a/cpukit/rtems/src/regionextend.c
+++ b/cpukit/rtems/src/regionextend.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -63,9 +63,11 @@ rtems_status_code rtems_region_extend(
   _RTEMS_Lock_allocator();                      /* to prevent deletion */
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regiongetfreeinfo.c b/cpukit/rtems/src/regiongetfreeinfo.c
index 153f965d8c..3ad06374fb 100644
--- a/cpukit/rtems/src/regiongetfreeinfo.c
+++ b/cpukit/rtems/src/regiongetfreeinfo.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -58,9 +58,11 @@ rtems_status_code rtems_region_get_free_information(
   _RTEMS_Lock_allocator();
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regiongetinfo.c b/cpukit/rtems/src/regiongetinfo.c
index 3b0497fce8..9843338b0a 100644
--- a/cpukit/rtems/src/regiongetinfo.c
+++ b/cpukit/rtems/src/regiongetinfo.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -56,9 +56,11 @@ rtems_status_code rtems_region_get_information(
   _RTEMS_Lock_allocator();
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regiongetsegment.c b/cpukit/rtems/src/regiongetsegment.c
index c9793af31f..6340cd915e 100644
--- a/cpukit/rtems/src/regiongetsegment.c
+++ b/cpukit/rtems/src/regiongetsegment.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -70,9 +70,11 @@ rtems_status_code rtems_region_get_segment(
   executing  = _Thread_Executing;
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regiongetsegmentsize.c b/cpukit/rtems/src/regiongetsegmentsize.c
index b7792eac09..c89efd0d36 100644
--- a/cpukit/rtems/src/regiongetsegmentsize.c
+++ b/cpukit/rtems/src/regiongetsegmentsize.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -63,9 +63,11 @@ rtems_status_code rtems_region_get_segment_size(
   executing  = _Thread_Executing;
   the_region = _Region_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regionresizesegment.c b/cpukit/rtems/src/regionresizesegment.c
index b83ed2c6e6..ab74eb35a0 100644
--- a/cpukit/rtems/src/regionresizesegment.c
+++ b/cpukit/rtems/src/regionresizesegment.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -63,9 +63,11 @@ rtems_status_code rtems_region_resize_segment(
   the_region = _Region_Get( id, &location );
   switch ( location ) {
 
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/regionreturnsegment.c b/cpukit/rtems/src/regionreturnsegment.c
index dc080e5ed5..4c08b44d59 100644
--- a/cpukit/rtems/src/regionreturnsegment.c
+++ b/cpukit/rtems/src/regionreturnsegment.c
@@ -2,7 +2,7 @@
  *  Region Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -65,9 +65,11 @@ rtems_status_code rtems_region_return_segment(
   the_region = _Region_Get( id, &location );
   switch ( location ) {
 
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:        /* this error cannot be returned */
       _RTEMS_Unlock_allocator();
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       _RTEMS_Unlock_allocator();
diff --git a/cpukit/rtems/src/semdelete.c b/cpukit/rtems/src/semdelete.c
index 450333a51c..5146a8bb7a 100644
--- a/cpukit/rtems/src/semdelete.c
+++ b/cpukit/rtems/src/semdelete.c
@@ -15,7 +15,7 @@
  *     + acquire a semaphore
  *     + release a semaphore
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -81,8 +81,8 @@ rtems_status_code rtems_semaphore_delete(
   the_semaphore = _Semaphore_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/semflush.c b/cpukit/rtems/src/semflush.c
index 823dd7692f..7ce44b4292 100644
--- a/cpukit/rtems/src/semflush.c
+++ b/cpukit/rtems/src/semflush.c
@@ -6,7 +6,7 @@
  *  This package is the implementation of the flush directive
  *  of the Semaphore Manager.
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -71,8 +71,8 @@ rtems_status_code rtems_semaphore_flush(
   the_semaphore = _Semaphore_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/semobtain.c b/cpukit/rtems/src/semobtain.c
index bfa8831f6a..55d41acc0d 100644
--- a/cpukit/rtems/src/semobtain.c
+++ b/cpukit/rtems/src/semobtain.c
@@ -15,7 +15,7 @@
  *     + acquire a semaphore
  *     + release a semaphore
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -77,8 +77,8 @@ rtems_status_code rtems_semaphore_obtain(
 
   the_semaphore = _Semaphore_Get_interrupt_disable( id, &location, &level );
   switch ( location ) {
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Semaphore_MP_Send_request_packet(
           SEMAPHORE_MP_OBTAIN_REQUEST,
           id,
diff --git a/cpukit/rtems/src/semrelease.c b/cpukit/rtems/src/semrelease.c
index 69647132c2..cbb7b97fc8 100644
--- a/cpukit/rtems/src/semrelease.c
+++ b/cpukit/rtems/src/semrelease.c
@@ -15,7 +15,7 @@
  *     + acquire a semaphore
  *     + release a semaphore
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -81,8 +81,8 @@ rtems_status_code rtems_semaphore_release(
   the_semaphore = _Semaphore_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Semaphore_MP_Send_request_packet(
         SEMAPHORE_MP_RELEASE_REQUEST,
         id,
diff --git a/cpukit/rtems/src/signalsend.c b/cpukit/rtems/src/signalsend.c
index 2d05a5249b..33db2b8aba 100644
--- a/cpukit/rtems/src/signalsend.c
+++ b/cpukit/rtems/src/signalsend.c
@@ -2,7 +2,7 @@
  *  Signal Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -56,8 +56,8 @@ rtems_status_code rtems_signal_send(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _Signal_MP_Send_request_packet(
         SIGNAL_MP_SEND_REQUEST,
         id,
diff --git a/cpukit/rtems/src/taskdelete.c b/cpukit/rtems/src/taskdelete.c
index 9eefcb919b..ee21f75bf5 100644
--- a/cpukit/rtems/src/taskdelete.c
+++ b/cpukit/rtems/src/taskdelete.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -61,8 +61,8 @@ rtems_status_code rtems_task_delete(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
@@ -73,11 +73,13 @@ rtems_status_code rtems_task_delete(
     case OBJECTS_LOCAL:
       the_information = _Objects_Get_information( the_thread->Object.id );
 
+#if defined(RTEMS_DEBUG)
       if ( !the_information ) {
         _Thread_Enable_dispatch();
         return RTEMS_INVALID_ID;
         /* This should never happen if _Thread_Get() works right */
       }
+#endif
 
       _Thread_Close( the_information, the_thread );
 
diff --git a/cpukit/rtems/src/taskgetnote.c b/cpukit/rtems/src/taskgetnote.c
index 7d01b9455f..42328468be 100644
--- a/cpukit/rtems/src/taskgetnote.c
+++ b/cpukit/rtems/src/taskgetnote.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -85,8 +85,8 @@ rtems_status_code rtems_task_get_note(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = note;
 
       return _RTEMS_tasks_MP_Send_request_packet(
diff --git a/cpukit/rtems/src/taskissuspended.c b/cpukit/rtems/src/taskissuspended.c
index a60d23af71..b682a5786f 100644
--- a/cpukit/rtems/src/taskissuspended.c
+++ b/cpukit/rtems/src/taskissuspended.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -58,9 +58,8 @@ rtems_status_code rtems_task_is_suspended(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
-
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/taskrestart.c b/cpukit/rtems/src/taskrestart.c
index b24b00b9ee..d374d43fc4 100644
--- a/cpukit/rtems/src/taskrestart.c
+++ b/cpukit/rtems/src/taskrestart.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -61,8 +61,8 @@ rtems_status_code rtems_task_restart(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/taskresume.c b/cpukit/rtems/src/taskresume.c
index 4d6e5b4444..345797c2a1 100644
--- a/cpukit/rtems/src/taskresume.c
+++ b/cpukit/rtems/src/taskresume.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -57,8 +57,8 @@ rtems_status_code rtems_task_resume(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _RTEMS_tasks_MP_Send_request_packet(
           RTEMS_TASKS_MP_RESUME_REQUEST,
           id,
diff --git a/cpukit/rtems/src/tasksetnote.c b/cpukit/rtems/src/tasksetnote.c
index 60aabcd191..3cf9fbbd80 100644
--- a/cpukit/rtems/src/tasksetnote.c
+++ b/cpukit/rtems/src/tasksetnote.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -81,8 +81,8 @@ rtems_status_code rtems_task_set_note(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _RTEMS_tasks_MP_Send_request_packet(
         RTEMS_TASKS_MP_SET_NOTE_REQUEST,
         id,
diff --git a/cpukit/rtems/src/tasksetpriority.c b/cpukit/rtems/src/tasksetpriority.c
index 432837780c..931699a2a2 100644
--- a/cpukit/rtems/src/tasksetpriority.c
+++ b/cpukit/rtems/src/tasksetpriority.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -70,8 +70,8 @@ rtems_status_code rtems_task_set_priority(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Executing->Wait.return_argument = old_priority;
       return _RTEMS_tasks_MP_Send_request_packet(
           RTEMS_TASKS_MP_SET_PRIORITY_REQUEST,
diff --git a/cpukit/rtems/src/taskstart.c b/cpukit/rtems/src/taskstart.c
index 3e1028daf0..a15d135be2 100644
--- a/cpukit/rtems/src/taskstart.c
+++ b/cpukit/rtems/src/taskstart.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -65,8 +65,8 @@ rtems_status_code rtems_task_start(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       _Thread_Dispatch();
       return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
diff --git a/cpukit/rtems/src/tasksuspend.c b/cpukit/rtems/src/tasksuspend.c
index bb27b37dc9..1e0d109192 100644
--- a/cpukit/rtems/src/tasksuspend.c
+++ b/cpukit/rtems/src/tasksuspend.c
@@ -2,7 +2,7 @@
  *  RTEMS Task Manager
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -58,8 +58,8 @@ rtems_status_code rtems_task_suspend(
   the_thread = _Thread_Get( id, &location );
   switch ( location ) {
 
-    case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+    case OBJECTS_REMOTE:
       return _RTEMS_tasks_MP_Send_request_packet(
         RTEMS_TASKS_MP_SUSPEND_REQUEST,
         id,
diff --git a/cpukit/rtems/src/taskvariableadd.c b/cpukit/rtems/src/taskvariableadd.c
index c37b0c22f5..a1d7fef19d 100644
--- a/cpukit/rtems/src/taskvariableadd.c
+++ b/cpukit/rtems/src/taskvariableadd.c
@@ -2,7 +2,7 @@
  *  rtems_task_variable_add - Add a per-task variable
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -41,17 +41,15 @@ rtems_status_code rtems_task_variable_add(
 
   the_thread = _Thread_Get (tid, &location);
   switch (location) {
-  case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+  case OBJECTS_REMOTE:
     _Thread_Dispatch();
     return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
 
   case OBJECTS_ERROR:
-    return RTEMS_INVALID_ID;
-
   default:
-    return RTEMS_INTERNAL_ERROR;
+    return RTEMS_INVALID_ID;
 
   case OBJECTS_LOCAL:
 
diff --git a/cpukit/rtems/src/taskvariabledelete.c b/cpukit/rtems/src/taskvariabledelete.c
index cf16cdc6a2..9f3e9a2e40 100644
--- a/cpukit/rtems/src/taskvariabledelete.c
+++ b/cpukit/rtems/src/taskvariabledelete.c
@@ -2,7 +2,7 @@
  *  rtems_task_variable_delete - Delete a per-task variable
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -42,17 +42,16 @@ rtems_status_code rtems_task_variable_delete(
 
   the_thread = _Thread_Get (tid, &location);
   switch (location) {
-  case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+  case OBJECTS_REMOTE:
     _Thread_Dispatch();
     return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
 
-  case OBJECTS_ERROR:
-    return RTEMS_INVALID_ID;
 
+  case OBJECTS_ERROR:
   default:
-    return RTEMS_INTERNAL_ERROR;
+    return RTEMS_INVALID_ID;
 
   case OBJECTS_LOCAL:
     tvp = the_thread->task_variables;
diff --git a/cpukit/rtems/src/taskvariableget.c b/cpukit/rtems/src/taskvariableget.c
index 0736d131af..8b200f8779 100644
--- a/cpukit/rtems/src/taskvariableget.c
+++ b/cpukit/rtems/src/taskvariableget.c
@@ -2,7 +2,7 @@
  *  rtems_task_variable_get - Get a per-task variable
  *
  *
- *  COPYRIGHT (c) 1989-1999.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -44,17 +44,15 @@ rtems_status_code rtems_task_variable_get(
 
   the_thread = _Thread_Get (tid, &location);
   switch (location) {
-  case OBJECTS_REMOTE:
 #if defined(RTEMS_MULTIPROCESSING)
+  case OBJECTS_REMOTE:
     _Thread_Dispatch();
     return RTEMS_ILLEGAL_ON_REMOTE_OBJECT;
 #endif
 
   case OBJECTS_ERROR:
-    return RTEMS_INVALID_ID;
-
   default:
-    return RTEMS_INTERNAL_ERROR;
+    return RTEMS_INVALID_ID;
 
   case OBJECTS_LOCAL:
 
diff --git a/cpukit/rtems/src/timercancel.c b/cpukit/rtems/src/timercancel.c
index 562524ede9..fd8d1bee32 100644
--- a/cpukit/rtems/src/timercancel.c
+++ b/cpukit/rtems/src/timercancel.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_cancel directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -48,8 +48,10 @@ rtems_status_code rtems_timer_cancel(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerdelete.c b/cpukit/rtems/src/timerdelete.c
index f40550e4a2..a60e32e5cb 100644
--- a/cpukit/rtems/src/timerdelete.c
+++ b/cpukit/rtems/src/timerdelete.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_delete directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -48,8 +48,10 @@ rtems_status_code rtems_timer_delete(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerfireafter.c b/cpukit/rtems/src/timerfireafter.c
index bb5a2b3adc..2888017943 100644
--- a/cpukit/rtems/src/timerfireafter.c
+++ b/cpukit/rtems/src/timerfireafter.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_fire_after directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -61,8 +61,10 @@ rtems_status_code rtems_timer_fire_after(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerfirewhen.c b/cpukit/rtems/src/timerfirewhen.c
index 9e165751e6..83b7438b82 100644
--- a/cpukit/rtems/src/timerfirewhen.c
+++ b/cpukit/rtems/src/timerfirewhen.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_fire_when directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -68,8 +68,10 @@ rtems_status_code rtems_timer_fire_when(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timergetinfo.c b/cpukit/rtems/src/timergetinfo.c
index d57f3bf669..0639a8a245 100644
--- a/cpukit/rtems/src/timergetinfo.c
+++ b/cpukit/rtems/src/timergetinfo.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_get_information directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -55,8 +55,10 @@ rtems_status_code rtems_timer_get_information(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerreset.c b/cpukit/rtems/src/timerreset.c
index 36f13cf18d..4f50088637 100644
--- a/cpukit/rtems/src/timerreset.c
+++ b/cpukit/rtems/src/timerreset.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_reset directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -48,8 +48,10 @@ rtems_status_code rtems_timer_reset(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerserverfireafter.c b/cpukit/rtems/src/timerserverfireafter.c
index 2d653a6db0..0527b970ee 100644
--- a/cpukit/rtems/src/timerserverfireafter.c
+++ b/cpukit/rtems/src/timerserverfireafter.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_server fire_after directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -65,8 +65,10 @@ rtems_status_code rtems_timer_server_fire_after(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;
diff --git a/cpukit/rtems/src/timerserverfirewhen.c b/cpukit/rtems/src/timerserverfirewhen.c
index 1b3dfb3d14..a2cf3a291c 100644
--- a/cpukit/rtems/src/timerserverfirewhen.c
+++ b/cpukit/rtems/src/timerserverfirewhen.c
@@ -2,7 +2,7 @@
  *  Timer Manager - rtems_timer_server fire_when directive
  *
  *
- *  COPYRIGHT (c) 1989-2002.
+ *  COPYRIGHT (c) 1989-2007.
  *  On-Line Applications Research Corporation (OAR).
  *
  *  The license and distribution terms for this file may be
@@ -72,8 +72,10 @@ rtems_status_code rtems_timer_server_fire_when(
 
   the_timer = _Timer_Get( id, &location );
   switch ( location ) {
+#if defined(RTEMS_MULTIPROCESSING)
     case OBJECTS_REMOTE:            /* should never return this */
       return RTEMS_INTERNAL_ERROR;
+#endif
 
     case OBJECTS_ERROR:
       return RTEMS_INVALID_ID;