Widen the enable/disable helper function's argument in line with the

ithread_create() changes etc.  This should be mostly a NOP.

4 files changed, 13 insertions, 13 deletions

diff --git a/sys/powerpc/include/intr_machdep.h b/sys/powerpc/include/intr_machdep.h
index 2d07a8b..d2d548e 100644
--- a/sys/powerpc/include/intr_machdep.h
+++ b/sys/powerpc/include/intr_machdep.h
@@ -40,7 +40,7 @@ struct intr_handler {
 	u_int		ih_flags;
 };
 
-void	intr_init(void (*)(void), int, void (*)(int), void (*)(int));
+void	intr_init(void (*)(void), int, void (*)(uintptr_t), void (*)(uintptr_t));
 void	intr_setup(u_int, ih_func_t *, void *, u_int);
 int	inthand_add(const char *, u_int, void (*)(void *), void *, int,
 	    void **);
diff --git a/sys/powerpc/powermac/hrowpic.c b/sys/powerpc/powermac/hrowpic.c
index 5aeef93..ed4b9c2 100644
--- a/sys/powerpc/powermac/hrowpic.c
+++ b/sys/powerpc/powermac/hrowpic.c
@@ -94,8 +94,8 @@ static int	hrowpic_macio_attach(device_t);
  * Local routines
  */
 static void	hrowpic_intr(void);
-static void	hrowpic_ext_enable_irq(int);
-static void	hrowpic_ext_disable_irq(int);
+static void	hrowpic_ext_enable_irq(uintptr_t);
+static void	hrowpic_ext_disable_irq(uintptr_t);
 static void	hrowpic_toggle_irq(struct hrowpic_softc *sc, int, int);
 
 /*
@@ -375,13 +375,13 @@ hrowpic_intr(void)
 }
 
 static void
-hrowpic_ext_enable_irq(int irq)
+hrowpic_ext_enable_irq(uintptr_t irq)
 {
 	hrowpic_toggle_irq(hpicsoftc, irq, 1);
 }
 
 static void
-hrowpic_ext_disable_irq(int irq)
+hrowpic_ext_disable_irq(uintptr_t irq)
 {
 	hrowpic_toggle_irq(hpicsoftc, irq, 0);
 }
diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c
index 8682714..4f0684d 100644
--- a/sys/powerpc/powerpc/intr_machdep.c
+++ b/sys/powerpc/powerpc/intr_machdep.c
@@ -99,12 +99,12 @@ extern u_long	extint_call;
 static ih_func_t	intr_stray_handler;
 static ih_func_t	sched_ithd;
 
-static void		(*irq_enable)(int);
-static void		(*irq_disable)(int);
+static void		(*irq_enable)(uintptr_t);
+static void		(*irq_disable)(uintptr_t);
 
 void
-intr_init(void (*handler)(void), int nirq, void (*irq_e)(int),
-    void (*irq_d)(int))
+intr_init(void (*handler)(void), int nirq, void (*irq_e)(uintptr_t),
+    void (*irq_d)(uintptr_t))
 {
 	int		i;
 	u_int32_t	msr;
diff --git a/sys/powerpc/powerpc/openpic.c b/sys/powerpc/powerpc/openpic.c
index 27a8cb8..864fae4 100644
--- a/sys/powerpc/powerpc/openpic.c
+++ b/sys/powerpc/powerpc/openpic.c
@@ -85,8 +85,8 @@ static void		openpic_enable_irq(struct openpic_softc *, int, int);
 static void		openpic_disable_irq(struct openpic_softc *, int);
 static void		openpic_set_priority(struct openpic_softc *, int, int);
 static void		openpic_intr(void);
-static void		irq_enable(int);
-static void		irq_disable(int);
+static void		irq_enable(uintptr_t);
+static void		irq_disable(uintptr_t);
 
 /*
  * Driver methods.
@@ -476,14 +476,14 @@ start:
 }
 
 static void
-irq_enable(int irq)
+irq_enable(uintptr_t irq)
 {
 
 	openpic_enable_irq(softc, irq, IST_LEVEL);
 }
 
 static void
-irq_disable(int irq)
+irq_disable(uintptr_t irq)
 {
 
 	openpic_disable_irq(softc, irq);