4 files changed, 9 insertions, 6 deletions
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu.c b/c/src/exec/score/cpu/hppa1.1/cpu.c
index 6dee0c1225..ba70357a33 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu.c
+++ b/c/src/exec/score/cpu/hppa1.1/cpu.c
@@ -193,7 +193,7 @@ void _CPU_ISR_install_vector(
 void
 hppa_external_interrupt_initialize(void)
 {
-    hppa_rtems_isr_entry ignore;
+    hppa_rtems_isr_entry ignore = 0;
 
     /* mark them all unused */
 
@@ -201,8 +201,11 @@ hppa_external_interrupt_initialize(void)
     DISMISS(~0);
 
     /* install the external interrupt handler */
-    rtems_interrupt_catch((rtems_isr_entry) hppa_external_interrupt,
-                          HPPA_INTERRUPT_EXTERNAL_INTERRUPT, &ignore) ;
+  _CPU_ISR_install_vector(
+    HPPA_INTERRUPT_EXTERNAL_INTERRUPT,
+    (proc_ptr)hppa_external_interrupt,
+    (proc_ptr *)ignore
+  );
 }
 
 /*
diff --git a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
index 229efed42c..7b9e940b77 100644
--- a/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
+++ b/c/src/exec/score/cpu/hppa1.1/cpu_asm.s
@@ -24,7 +24,7 @@
 #      Division Incorporated makes no representations about the
 #      suitability of this software for any purpose.
 #
- *  $Id$
+#  $Id$
 #
 
 #include <rtems/core/hppa.h>
diff --git a/c/src/exec/score/cpu/hppa1.1/hppa.h b/c/src/exec/score/cpu/hppa1.1/hppa.h
index 60bb854357..801a2edca2 100644
--- a/c/src/exec/score/cpu/hppa1.1/hppa.h
+++ b/c/src/exec/score/cpu/hppa1.1/hppa.h
@@ -636,7 +636,7 @@ get_ ## name (void)                            \
 }
 
 #define EMIT_SET_CONTROL(name, reg)            \
-static __inline__ unsigned int                 \
+static __inline__ void                         \
 set_ ## name (unsigned int new_value)          \
 {                                              \
     HPPA_ASM_MTCTL(new_value, reg);            \
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems.s b/c/src/exec/score/cpu/hppa1.1/rtems.s
index 0e9305644e..e59be60201 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems.s
+++ b/c/src/exec/score/cpu/hppa1.1/rtems.s
@@ -14,7 +14,7 @@
  *  $Id$
  */
 
-#include <rtems/hppa.h>
+#include <rtems/core/hppa.h>
 #include <rtems/core/cpu_asm.h>
 
 	.SPACE $PRIVATE$