3 files changed, 7 insertions, 4 deletions
diff --git a/cpukit/score/cpu/hppa1.1/cpu.c b/cpukit/score/cpu/hppa1.1/cpu.c
index 6cb6347151..6dee0c1225 100644
--- a/cpukit/score/cpu/hppa1.1/cpu.c
+++ b/cpukit/score/cpu/hppa1.1/cpu.c
@@ -33,8 +33,8 @@ void hppa_external_interrupt(unsigned32, CPU_Interrupt_frame *);
  * So we use our own prototype instead of rtems_isr_entry
  */
 
-typedef rtems_isr ( *hppa_rtems_isr_entry )(
-    rtems_vector_number,
+typedef void ( *hppa_rtems_isr_entry )(
+    ISR_Vector_number,
     CPU_Interrupt_frame *
  );
 
@@ -193,7 +193,7 @@ void _CPU_ISR_install_vector(
 void
 hppa_external_interrupt_initialize(void)
 {
-    rtems_isr_entry ignore;
+    hppa_rtems_isr_entry ignore;
 
     /* mark them all unused */
 
diff --git a/cpukit/score/src/mpci.c b/cpukit/score/src/mpci.c
index ee72d6c396..33bfee80c5 100644
--- a/cpukit/score/src/mpci.c
+++ b/cpukit/score/src/mpci.c
@@ -67,7 +67,7 @@ void _MPCI_Handler_initialization(
     THREAD_QUEUE_DISCIPLINE_FIFO,
     STATES_WAITING_FOR_RPC_REPLY,
     NULL,
-    RTEMS_TIMEOUT
+    RTEMS_TIMEOUT   /* XXX */
   );
 }
 
diff --git a/cpukit/score/src/thread.c b/cpukit/score/src/thread.c
index d507e8e075..3f58c8ef12 100644
--- a/cpukit/score/src/thread.c
+++ b/cpukit/score/src/thread.c
@@ -471,6 +471,9 @@ void _Thread_Close(
 
   if ( the_thread->extensions )
     (void) _Workspace_Free( the_thread->extensions );
+
+  the_thread->Start.stack = NULL;
+  the_thread->extensions = NULL;
 }
 
 /*PAGE