Constify the what/name parameter of pci_intr_establish().

Tested by myself, sthen, oga, kettenis, and jasper.
Input from sthen and jasper.

ok kettenis

(Manpage follows shortly.)

62 files changed, 150 insertions, 148 deletions

diff --git a/sys/arch/alpha/eisa/eisa_machdep.h b/sys/arch/alpha/eisa/eisa_machdep.h
index bdbc10b7012..729d3ec4ca1 100644
--- a/sys/arch/alpha/eisa/eisa_machdep.h
+++ b/sys/arch/alpha/eisa/eisa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: eisa_machdep.h,v 1.7 2008/07/25 21:11:14 miod Exp $	*/
+/*	$OpenBSD: eisa_machdep.h,v 1.8 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: eisa_machdep.h,v 1.1 1996/04/12 05:39:51 cgd Exp $	*/
 
 /*
@@ -44,7 +44,7 @@ struct alpha_eisa_chipset {
 		    eisa_intr_handle_t *);
 	const char *(*ec_intr_string)(void *, eisa_intr_handle_t);
 	void	*(*ec_intr_establish)(void *, eisa_intr_handle_t,
-		    int, int, int (*)(void *), void *, char *);
+		    int, int, int (*)(void *), void *, const char *);
 	void	(*ec_intr_disestablish)(void *, void *);
 };
 
diff --git a/sys/arch/alpha/isa/isa_machdep.h b/sys/arch/alpha/isa/isa_machdep.h
index 55181455db8..c72c63b93ba 100644
--- a/sys/arch/alpha/isa/isa_machdep.h
+++ b/sys/arch/alpha/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.12 2002/03/14 03:15:50 millert Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.13 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.3 1996/11/19 04:53:07 cgd Exp $	*/
 
 /*
@@ -39,7 +39,7 @@ struct alpha_isa_chipset {
 	void	(*ic_attach_hook)(struct device *, struct device *,
 		    struct isabus_attach_args *);
 	void	*(*ic_intr_establish)(void *, int, int, int,
-		    int (*)(void *), void *, char *);
+		    int (*)(void *), void *, const char *);
 	void	(*ic_intr_disestablish)(void *, void *);
 	int	(*ic_intr_alloc)(isa_chipset_tag_t *, int, int, int *);
 };
diff --git a/sys/arch/alpha/pci/pci_1000.c b/sys/arch/alpha/pci/pci_1000.c
index 0edcb89b8af..5a88e95e7b5 100644
--- a/sys/arch/alpha/pci/pci_1000.c
+++ b/sys/arch/alpha/pci/pci_1000.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000.c,v 1.8 2008/07/22 18:45:50 miod Exp $ */
+/* $OpenBSD: pci_1000.c,v 1.9 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_1000.c,v 1.12 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*
@@ -88,7 +88,7 @@ int	dec_1000_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_1000_intr_string(void *, pci_intr_handle_t);
 int	dec_1000_intr_line(void *, pci_intr_handle_t);
 void	*dec_1000_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_1000_intr_disestablish(void *, void *);
 
 #define	PCI_NIRQ	16
@@ -206,7 +206,7 @@ dec_1000_intr_establish(ccv, ih, level, func, arg, name)
         int level;
         int (*func)(void *);
 	void *arg;
-	char *name;
+	const char *name;
 {           
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/pci_1000a.c b/sys/arch/alpha/pci/pci_1000a.c
index 22115d0c1fa..c1a467eea2b 100644
--- a/sys/arch/alpha/pci/pci_1000a.c
+++ b/sys/arch/alpha/pci/pci_1000a.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_1000a.c,v 1.10 2008/07/22 18:47:24 miod Exp $ */
+/* $OpenBSD: pci_1000a.c,v 1.11 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_1000a.c,v 1.14 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*
@@ -95,7 +95,7 @@ int	dec_1000a_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_1000a_intr_string(void *, pci_intr_handle_t);
 int	dec_1000a_intr_line(void *, pci_intr_handle_t);
 void	*dec_1000a_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_1000a_intr_disestablish(void *, void *);
 
 struct alpha_shared_intr *dec_1000a_pci_intr;
@@ -266,7 +266,7 @@ dec_1000a_intr_establish(ccv, ih, level, func, arg, name)
         int level;
         int (*func)(void *);
 	void *arg;
-	char *name;
+	const char *name;
 {           
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/pci_2100_a50.c b/sys/arch/alpha/pci/pci_2100_a50.c
index 2ebaa224f30..53e8bbca5a0 100644
--- a/sys/arch/alpha/pci/pci_2100_a50.c
+++ b/sys/arch/alpha/pci/pci_2100_a50.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_2100_a50.c,v 1.21 2008/07/22 18:45:50 miod Exp $	*/
+/*	$OpenBSD: pci_2100_a50.c,v 1.22 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_2100_a50.c,v 1.12 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -56,7 +56,7 @@ int	dec_2100_a50_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_2100_a50_intr_string(void *, pci_intr_handle_t);
 int	 dec_2100_a50_intr_line(void *, pci_intr_handle_t);
 void    *dec_2100_a50_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void    dec_2100_a50_intr_disestablish(void *, void *);
 
 #define	APECS_SIO_DEVICE	7	/* XXX */
@@ -233,7 +233,7 @@ dec_2100_a50_intr_establish(acv, ih, level, func, arg, name)
 	pci_intr_handle_t ih;
 	int level;
 	int (*func)(void *);
-	char *name;
+	const char *name;
 {
 	return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
 	    arg, name);
diff --git a/sys/arch/alpha/pci/pci_550.c b/sys/arch/alpha/pci/pci_550.c
index 32515925ad3..11be1487938 100644
--- a/sys/arch/alpha/pci/pci_550.c
+++ b/sys/arch/alpha/pci/pci_550.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_550.c,v 1.19 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_550.c,v 1.20 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_550.c,v 1.18 2000/06/29 08:58:48 mrg Exp $ */
 
 /*-
@@ -91,7 +91,7 @@ int	dec_550_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_550_intr_string(void *, pci_intr_handle_t);
 int	dec_550_intr_line(void *, pci_intr_handle_t);
 void	*dec_550_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_550_intr_disestablish(void *, void *);
 
 void	*dec_550_pciide_compat_intr_establish(void *, struct device *,
@@ -288,7 +288,7 @@ dec_550_intr_establish(ccv, ih, level, func, arg, name)
 	pci_intr_handle_t ih;
 	int level;
 	int (*func)(void *);
-	char *name;
+	const char *name;
 {
 #if 0
 	struct cia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_6600.c b/sys/arch/alpha/pci/pci_6600.c
index 1cc504bc778..6a1c9f7f78b 100644
--- a/sys/arch/alpha/pci/pci_6600.c
+++ b/sys/arch/alpha/pci/pci_6600.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_6600.c,v 1.17 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_6600.c,v 1.18 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_6600.c,v 1.5 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -78,7 +78,7 @@ static struct tsp_config *sioprimary;
 
 void dec_6600_intr_disestablish(void *, void *);
 void *dec_6600_intr_establish(void *, pci_intr_handle_t, int,
-    int (*func)(void *), void *, char *);
+    int (*func)(void *), void *, const char *);
 const char *dec_6600_intr_string(void *, pci_intr_handle_t);
 int dec_6600_intr_line(void *, pci_intr_handle_t);
 int dec_6600_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
@@ -219,7 +219,7 @@ dec_6600_intr_establish(acv, ih, level, func, arg, name)
         pci_intr_handle_t ih;
         int level;
         int (*func)(void *);
-	char *name;
+	const char *name;
 {
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/pci_axppci_33.c b/sys/arch/alpha/pci/pci_axppci_33.c
index bf1db3a9764..b2b50af7d4c 100644
--- a/sys/arch/alpha/pci/pci_axppci_33.c
+++ b/sys/arch/alpha/pci/pci_axppci_33.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_axppci_33.c,v 1.19 2008/07/22 18:45:51 miod Exp $	*/
+/*	$OpenBSD: pci_axppci_33.c,v 1.20 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_axppci_33.c,v 1.10 1996/11/13 21:13:29 cgd Exp $	*/
 
 /*
@@ -56,7 +56,7 @@ int     dec_axppci_33_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_axppci_33_intr_string(void *, pci_intr_handle_t);
 int	dec_axppci_33_intr_line(void *, pci_intr_handle_t);
 void    *dec_axppci_33_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void    dec_axppci_33_intr_disestablish(void *, void *);
 
 #define	LCA_SIO_DEVICE	7	/* XXX */
@@ -232,7 +232,7 @@ dec_axppci_33_intr_establish(lcv, ih, level, func, arg, name)
 	pci_intr_handle_t ih;
 	int level;
 	int (*func)(void *);
-	char *name;
+	const char *name;
 {
 	return sio_intr_establish(NULL /*XXX*/, ih, IST_LEVEL, level, func,
 	    arg, name);
diff --git a/sys/arch/alpha/pci/pci_eb164.c b/sys/arch/alpha/pci/pci_eb164.c
index 7478689b39c..89b7b325722 100644
--- a/sys/arch/alpha/pci/pci_eb164.c
+++ b/sys/arch/alpha/pci/pci_eb164.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb164.c,v 1.22 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_eb164.c,v 1.23 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_eb164.c,v 1.27 2000/06/06 00:50:15 thorpej Exp $ */
 
 /*-
@@ -91,7 +91,7 @@ int	dec_eb164_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_eb164_intr_string(void *, pci_intr_handle_t);
 int	dec_eb164_intr_line(void *, pci_intr_handle_t);
 void	*dec_eb164_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_eb164_intr_disestablish(void *, void *);
 
 void	*dec_eb164_pciide_compat_intr_establish(void *, struct device *,
@@ -259,7 +259,7 @@ dec_eb164_intr_establish(ccv, ih, level, func, arg, name)
         pci_intr_handle_t ih;
         int level;
         int (*func)(void *);
-	char *name;
+	const char *name;
 {
 #if 0
 	struct cia_config *ccp = ccv;
diff --git a/sys/arch/alpha/pci/pci_eb64plus.c b/sys/arch/alpha/pci/pci_eb64plus.c
index 02a1a1eeef2..a6f5ec46d19 100644
--- a/sys/arch/alpha/pci/pci_eb64plus.c
+++ b/sys/arch/alpha/pci/pci_eb64plus.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_eb64plus.c,v 1.11 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_eb64plus.c,v 1.12 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_eb64plus.c,v 1.10 2001/07/27 00:25:20 thorpej Exp $ */
 
 /*-
@@ -87,7 +87,7 @@
 int	dec_eb64plus_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_eb64plus_intr_string(void *, pci_intr_handle_t);
 void	*dec_eb64plus_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_eb64plus_intr_disestablish(void *, void *);
 
 #define	EB64PLUS_MAX_IRQ	32
@@ -196,7 +196,7 @@ dec_eb64plus_intr_establish(acv, ih, level, func, arg, name)
         int level;
         int (*func)(void *);
 	void *arg;
-	char *name;
+	const char *name;
 {
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/pci_kn20aa.c b/sys/arch/alpha/pci/pci_kn20aa.c
index 0409b4ea141..e087913cf43 100644
--- a/sys/arch/alpha/pci/pci_kn20aa.c
+++ b/sys/arch/alpha/pci/pci_kn20aa.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_kn20aa.c,v 1.23 2008/07/22 18:45:51 miod Exp $	*/
+/*	$OpenBSD: pci_kn20aa.c,v 1.24 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_kn20aa.c,v 1.21 1996/11/17 02:05:27 cgd Exp $	*/
 
 /*
@@ -58,7 +58,7 @@ int	dec_kn20aa_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dec_kn20aa_intr_string(void *, pci_intr_handle_t);
 int	dec_kn20aa_intr_line(void *, pci_intr_handle_t);
 void	*dec_kn20aa_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_kn20aa_intr_disestablish(void *, void *);
 
 #define	KN20AA_PCEB_IRQ	31
@@ -195,7 +195,7 @@ dec_kn20aa_intr_establish(ccv, ih, level, func, arg, name)
         pci_intr_handle_t ih;
         int level;
         int (*func)(void *);
-	char *name;
+	const char *name;
 {           
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/pci_kn300.c b/sys/arch/alpha/pci/pci_kn300.c
index 72b2a9bd9ae..fc1de6cddbd 100644
--- a/sys/arch/alpha/pci/pci_kn300.c
+++ b/sys/arch/alpha/pci/pci_kn300.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pci_kn300.c,v 1.2 2008/07/22 18:45:51 miod Exp $ */
+/* $OpenBSD: pci_kn300.c,v 1.3 2009/08/22 02:54:50 mk Exp $ */
 /* $NetBSD: pci_kn300.c,v 1.28 2005/12/11 12:16:17 christos Exp $ */
 
 /*
@@ -63,7 +63,7 @@ int	dec_kn300_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 
 const char *dec_kn300_intr_string(void *, pci_intr_handle_t);
 void	*dec_kn300_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	dec_kn300_intr_disestablish(void *, void *);
 
 #define	KN300_PCEB_IRQ	16
@@ -194,7 +194,7 @@ dec_kn300_intr_establish(ccv, ih, level, func, arg, name)
         pci_intr_handle_t ih;
         int level;
         int (*func) (void *);
-	char *name;
+	const char *name;
 {           
 	struct mcpcia_config *ccp = ccv;
 	void *cookie;
diff --git a/sys/arch/alpha/pci/pci_machdep.h b/sys/arch/alpha/pci/pci_machdep.h
index 887004babff..1c86e6bfd45 100644
--- a/sys/arch/alpha/pci/pci_machdep.h
+++ b/sys/arch/alpha/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.21 2008/07/22 18:45:51 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.22 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.6 1996/11/19 04:49:21 cgd Exp $	*/
 
 /*
@@ -65,7 +65,7 @@ struct alpha_pci_chipset {
 	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
 	int		(*pc_intr_line)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish)(void *, pci_intr_handle_t,
-			    int, int (*)(void *), void *, char *);
+			    int, int (*)(void *), void *, const char *);
 	void		(*pc_intr_disestablish)(void *, void *);
 
         /* alpha-specific */
diff --git a/sys/arch/alpha/pci/pci_up1000.c b/sys/arch/alpha/pci/pci_up1000.c
index cf1a9651777..2c24f3332d1 100644
--- a/sys/arch/alpha/pci/pci_up1000.c
+++ b/sys/arch/alpha/pci/pci_up1000.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_up1000.c,v 1.14 2008/07/22 18:45:51 miod Exp $	*/
+/*	$OpenBSD: pci_up1000.c,v 1.15 2009/08/22 02:54:50 mk Exp $	*/
 /* $NetBSD: pci_up1000.c,v 1.6 2000/12/28 22:59:07 sommerfeld Exp $ */
 
 /*-
@@ -62,7 +62,7 @@ int     api_up1000_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *api_up1000_intr_string(void *, pci_intr_handle_t);
 int	api_up1000_intr_line(void *, pci_intr_handle_t);
 void    *api_up1000_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void    api_up1000_intr_disestablish(void *, void *);
 
 void	*api_up1000_pciide_compat_intr_establish(void *, struct device *,
@@ -161,7 +161,7 @@ api_up1000_intr_line(void *icv, pci_intr_handle_t ih)
 
 void *
 api_up1000_intr_establish(void *icv, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 #if 0
 	struct irongate_config *icp = icv;
diff --git a/sys/arch/alpha/pci/sio_pic.c b/sys/arch/alpha/pci/sio_pic.c
index 52ca5489e65..03f4ee4c732 100644
--- a/sys/arch/alpha/pci/sio_pic.c
+++ b/sys/arch/alpha/pci/sio_pic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sio_pic.c,v 1.29 2008/08/09 16:41:21 miod Exp $	*/
+/*	$OpenBSD: sio_pic.c,v 1.30 2009/08/22 02:54:50 mk Exp $	*/
 /* $NetBSD: sio_pic.c,v 1.28 2000/06/06 03:10:13 thorpej Exp $ */
 
 /*-
@@ -447,7 +447,7 @@ sio_intr_establish(v, irq, type, level, fn, arg, name)
         int type;
         int level;
         int (*fn)(void *);
-	char *name;
+	const char *name;
 {
 	void *cookie;
 
diff --git a/sys/arch/alpha/pci/siovar.h b/sys/arch/alpha/pci/siovar.h
index a6d2ffaeae1..0e4a41c8cac 100644
--- a/sys/arch/alpha/pci/siovar.h
+++ b/sys/arch/alpha/pci/siovar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: siovar.h,v 1.12 2004/06/28 02:28:43 aaron Exp $	*/
+/*	$OpenBSD: siovar.h,v 1.13 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: siovar.h,v 1.5 1996/10/23 04:12:34 cgd Exp $	*/
 
 /*
@@ -36,7 +36,7 @@ void	sio_iointr(void *framep, unsigned long vec);
 const char *sio_intr_string(void *, int);
 int	sio_intr_line(void *, int);
 void	*sio_intr_establish(void *, int, int, int, int (*)(void *),
-	    void *, char *);
+	    void *, const char *);
 void	sio_intr_disestablish(void *, void *);
 
 struct evcount sio_intr_count;
diff --git a/sys/arch/amd64/amd64/intr.c b/sys/arch/amd64/amd64/intr.c
index b03a0232407..b13541fc3bf 100644
--- a/sys/arch/amd64/amd64/intr.c
+++ b/sys/arch/amd64/amd64/intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.c,v 1.22 2008/12/06 19:59:38 tedu Exp $	*/
+/*	$OpenBSD: intr.c,v 1.23 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: intr.c,v 1.3 2003/03/03 22:16:20 fvdl Exp $	*/
 
 /*
@@ -353,7 +353,7 @@ found:
 
 void *
 intr_establish(int legacy_irq, struct pic *pic, int pin, int type, int level,
-    int (*handler)(void *), void *arg, char *what)
+    int (*handler)(void *), void *arg, const char *what)
 {
 	struct intrhand **p, *q, *ih;
 	struct cpu_info *ci;
diff --git a/sys/arch/amd64/include/intr.h b/sys/arch/amd64/include/intr.h
index 2207a60d3d1..5361c4d7af0 100644
--- a/sys/arch/amd64/include/intr.h
+++ b/sys/arch/amd64/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.17 2009/04/19 17:50:18 oga Exp $	*/
+/*	$OpenBSD: intr.h,v 1.18 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: intr.h,v 1.2 2003/05/04 22:01:56 fvdl Exp $	*/
 
 /*-
@@ -209,7 +209,7 @@ int intr_allocate_slot_cpu(struct cpu_info *, struct pic *, int, int *);
 int intr_allocate_slot(struct pic *, int, int, int, struct cpu_info **, int *,
 	    int *);
 void *intr_establish(int, struct pic *, int, int, int, int (*)(void *),
-	    void *, char *);
+	    void *, const char *);
 void intr_disestablish(struct intrhand *);
 void cpu_intr_init(struct cpu_info *);
 int intr_find_mpmapping(int bus, int pin, int *handle);
diff --git a/sys/arch/amd64/include/pci_machdep.h b/sys/arch/amd64/include/pci_machdep.h
index 48d988ece77..aef11b9d37a 100644
--- a/sys/arch/amd64/include/pci_machdep.h
+++ b/sys/arch/amd64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.12 2009/07/20 23:40:41 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.13 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.1 2003/02/26 21:26:11 fvdl Exp $	*/
 
 /*
@@ -80,7 +80,7 @@ void		pci_conf_write(pci_chipset_tag_t, pcitag_t, int,
 int		pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
-		    int, int (*)(void *), void *, char *);
+		    int, int (*)(void *), void *, const char *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
 		    int *, int *, int *);
diff --git a/sys/arch/amd64/pci/pci_machdep.c b/sys/arch/amd64/pci/pci_machdep.c
index 1d78b000998..554c6e9d72d 100644
--- a/sys/arch/amd64/pci/pci_machdep.c
+++ b/sys/arch/amd64/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.30 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.31 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.3 2003/05/07 21:33:58 fvdl Exp $	*/
 
 /*-
@@ -326,7 +326,7 @@ void	acpiprt_route_interrupt(int bus, int dev, int pin);
 
 void *
 pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *what)
+    int (*func)(void *), void *arg, const char *what)
 {
 	int pin, irq;
 	int bus, dev;
diff --git a/sys/arch/arm/armv7/avic_intr.h b/sys/arch/arm/armv7/avic_intr.h
index a03354c738d..e1e68304807 100644
--- a/sys/arch/arm/armv7/avic_intr.h
+++ b/sys/arch/arm/armv7/avic_intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: avic_intr.h,v 1.1 2009/05/08 02:57:32 drahn Exp $ */
+/*	$OpenBSD: avic_intr.h,v 1.2 2009/08/22 02:54:50 mk Exp $ */
 /*	$NetBSD: pxa2x0_intr.h,v 1.4 2003/07/05 06:53:08 dogcow Exp $ */
 
 /* Derived from i80321_intr.h */
@@ -102,7 +102,7 @@ void armv7avic_intr_bootstrap(vaddr_t);
 
 void armv7avic_irq_handler(void *);
 void *armv7avic_intr_establish(int irqno, int level, int (*func)(void *),
-    void *cookie, char *name);
+    void *cookie, const char *name);
 void armv7avic_intr_disestablish(void *cookie);
 const char *armv7avic_intr_string(void *cookie);
 
diff --git a/sys/arch/arm/include/pci_machdep.h b/sys/arch/arm/include/pci_machdep.h
index 32094d85c14..31a519c982b 100644
--- a/sys/arch/arm/include/pci_machdep.h
+++ b/sys/arch/arm/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.6 2008/12/06 19:59:38 tedu Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.7 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.2 2002/05/15 19:23:52 thorpej Exp $	*/
 
 /*
@@ -68,7 +68,7 @@ struct arm32_pci_chipset {
 			    pci_intr_handle_t *);
 	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish)(void *, pci_intr_handle_t,
-			    int, int (*)(void *), void *, char *);
+			    int, int (*)(void *), void *, const char *);
 	void		(*pc_intr_disestablish)(void *, void *);
 };
 
diff --git a/sys/arch/arm/sa11x0/sa11x0_var.h b/sys/arch/arm/sa11x0/sa11x0_var.h
index b6e6fff1db6..a79c3fd0694 100644
--- a/sys/arch/arm/sa11x0/sa11x0_var.h
+++ b/sys/arch/arm/sa11x0/sa11x0_var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: sa11x0_var.h,v 1.4 2008/06/26 05:42:09 ray Exp $ */
+/*	$OpenBSD: sa11x0_var.h,v 1.5 2009/08/22 02:54:50 mk Exp $ */
 /*      $NetBSD: sa11x0_var.h,v 1.4 2003/04/14 14:18:41 rjs Exp $        */
 
 /*-
@@ -64,7 +64,7 @@ struct sa11x0_attach_args {
 };
 
 void *sa11x0_intr_establish(sa11x0_chipset_tag_t, int, int, int, 
-			    int (*)(void *), void *, char *);
+			    int (*)(void *), void *, const char *);
 void sa11x0_intr_disestablish(sa11x0_chipset_tag_t, void *);
 
 #endif /* _SA11X0_VAR_H */
diff --git a/sys/arch/arm/xscale/i80321_intr.c b/sys/arch/arm/xscale/i80321_intr.c
index 9ac0f057638..40da0d38489 100644
--- a/sys/arch/arm/xscale/i80321_intr.c
+++ b/sys/arch/arm/xscale/i80321_intr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: i80321_intr.c,v 1.12 2009/04/08 21:19:31 kettenis Exp $ */
+/* $OpenBSD: i80321_intr.c,v 1.13 2009/08/22 02:54:50 mk Exp $ */
 
 /*
  * Copyright (c) 2006 Dale Rahn <drahn@openbsd.org>
@@ -301,7 +301,7 @@ i80321intc_init(void)
 
 void *
 i80321_intr_establish(int irq, int ipl, int (*func)(void *), void *arg,
-    char *name)
+    const char *name)
 {
 	struct intrq *iq;
 	struct intrhand *ih;
diff --git a/sys/arch/arm/xscale/i80321var.h b/sys/arch/arm/xscale/i80321var.h
index cdf72ac83d9..9613a40cf0f 100644
--- a/sys/arch/arm/xscale/i80321var.h
+++ b/sys/arch/arm/xscale/i80321var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i80321var.h,v 1.3 2006/06/15 21:35:30 drahn Exp $	*/
+/*	$OpenBSD: i80321var.h,v 1.4 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: i80321var.h,v 1.10 2005/12/15 01:44:00 briggs Exp $	*/
 
 /*
@@ -57,7 +57,7 @@ struct intrhand {
 	int ih_ipl;			/* IPL_* */
 	int ih_irq;			/* IRQ number */
 	struct evcount  	ih_count;
-	char *ih_name;
+	const char *ih_name;
 };
 
 struct intrq {
diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.c b/sys/arch/arm/xscale/pxa2x0_gpio.c
index 748e0535585..e6dc20a4400 100644
--- a/sys/arch/arm/xscale/pxa2x0_gpio.c
+++ b/sys/arch/arm/xscale/pxa2x0_gpio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_gpio.c,v 1.20 2008/05/19 18:42:12 miod Exp $ */
+/*	$OpenBSD: pxa2x0_gpio.c,v 1.21 2009/08/22 02:54:50 mk Exp $ */
 /*	$NetBSD: pxa2x0_gpio.c,v 1.2 2003/07/15 00:24:55 lukem Exp $	*/
 
 /*
@@ -211,7 +211,7 @@ pxa2x0_gpio_bootstrap(vaddr_t gpio_regs)
 
 void *
 pxa2x0_gpio_intr_establish(u_int gpio, int level, int spl, int (*func)(void *),
-    void *arg, char *name)
+    void *arg, const char *name)
 {
 	struct pxagpio_softc *sc = pxagpio_softc;
 	struct gpio_irq_handler *gh;
diff --git a/sys/arch/arm/xscale/pxa2x0_gpio.h b/sys/arch/arm/xscale/pxa2x0_gpio.h
index c4f414a2dd9..bab08809bb4 100644
--- a/sys/arch/arm/xscale/pxa2x0_gpio.h
+++ b/sys/arch/arm/xscale/pxa2x0_gpio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_gpio.h,v 1.5 2005/04/08 21:50:37 uwe Exp $ */
+/*	$OpenBSD: pxa2x0_gpio.h,v 1.6 2009/08/22 02:54:50 mk Exp $ */
 /*	$wasabi$	*/
 
 /*
@@ -62,7 +62,7 @@ void pxa2x0_gpio_clear_intr(u_int gpio);
  * Establish/Disestablish interrupt handlers for GPIO pins
  */
 void *pxa2x0_gpio_intr_establish(u_int, int, int, int (*)(void *), void *,
-    char *);
+    const char *);
 void pxa2x0_gpio_intr_disestablish(void *);
 const char *pxa2x0_gpio_intr_string(void *);
 void pxa2x0_gpio_intr_mask(void *);
diff --git a/sys/arch/arm/xscale/pxa2x0_intr.c b/sys/arch/arm/xscale/pxa2x0_intr.c
index 8a9bb619dab..fc782e10492 100644
--- a/sys/arch/arm/xscale/pxa2x0_intr.c
+++ b/sys/arch/arm/xscale/pxa2x0_intr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pxa2x0_intr.c,v 1.18 2009/04/08 21:19:31 kettenis Exp $ */
+/*	$OpenBSD: pxa2x0_intr.c,v 1.19 2009/08/22 02:54:50 mk Exp $ */
 /*	$NetBSD: pxa2x0_intr.c,v 1.5 2003/07/15 00:24:55 lukem Exp $	*/
 
 /*
@@ -531,7 +531,7 @@ _setsoftintr(int si)
 
 void *
 pxa2x0_intr_establish(int irqno, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	int psw;
 #ifdef MULTIPLE_HANDLERS_ON_ONE_IRQ
diff --git a/sys/arch/armish/dev/iq80321_pci.c b/sys/arch/armish/dev/iq80321_pci.c
index 382f96f0740..881d1a6cfa1 100644
--- a/sys/arch/armish/dev/iq80321_pci.c
+++ b/sys/arch/armish/dev/iq80321_pci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: iq80321_pci.c,v 1.9 2007/05/10 17:59:24 deraadt Exp $	*/
+/*	$OpenBSD: iq80321_pci.c,v 1.10 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: iq80321_pci.c,v 1.5 2005/12/11 12:17:09 christos Exp $	*/
 
 /*
@@ -58,7 +58,7 @@
 int	iq80321_pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *iq80321_pci_intr_string(void *, pci_intr_handle_t);
 void	*iq80321_pci_intr_establish(void *, pci_intr_handle_t,
-	    int, int (*func)(void *), void *, char *);
+	    int, int (*func)(void *), void *, const char *);
 void	iq80321_pci_intr_disestablish(void *, void *);
 
 struct irq_map {
@@ -268,7 +268,7 @@ iq80321_pci_intr_string(void *v, pci_intr_handle_t ih)
 
 void *
 iq80321_pci_intr_establish(void *v, pci_intr_handle_t ih, int ipl,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 
 	return (i80321_intr_establish(ih, ipl, func, arg, name));
diff --git a/sys/arch/hppa/dev/apic.c b/sys/arch/hppa/dev/apic.c
index 7e8bc7f684d..58c48bc62dc 100644
--- a/sys/arch/hppa/dev/apic.c
+++ b/sys/arch/hppa/dev/apic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apic.c,v 1.7 2007/10/06 23:50:54 krw Exp $	*/
+/*	$OpenBSD: apic.c,v 1.8 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -149,7 +149,7 @@ apic_intr_string(void *v, pci_intr_handle_t ih)
 
 void *
 apic_intr_establish(void *v, pci_intr_handle_t ih,
-    int pri, int (*handler)(void *), void *arg, char *name)
+    int pri, int (*handler)(void *), void *arg, const char *name)
 {
 	struct elroy_softc *sc = v;
 	volatile struct elroy_regs *r = sc->sc_regs;
diff --git a/sys/arch/hppa/dev/dino.c b/sys/arch/hppa/dev/dino.c
index 5af79ba4e5b..e06acfdf213 100644
--- a/sys/arch/hppa/dev/dino.c
+++ b/sys/arch/hppa/dev/dino.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dino.c,v 1.25 2009/03/30 21:24:57 kettenis Exp $	*/
+/*	$OpenBSD: dino.c,v 1.26 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2003-2005 Michael Shalayeff
@@ -165,7 +165,7 @@ void	dino_conf_write(void *, pcitag_t, int, pcireg_t);
 int	dino_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *dino_intr_string(void *, pci_intr_handle_t);
 void *	dino_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *),
-	    void *, char *);
+	    void *, const char *);
 void	dino_intr_disestablish(void *, void *);
 int	dino_iomap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
 int	dino_memmap(void *, bus_addr_t, bus_size_t, int, bus_space_handle_t *);
@@ -391,7 +391,7 @@ dino_intr_string(void *v, pci_intr_handle_t ih)
 
 void *
 dino_intr_establish(void *v, pci_intr_handle_t ih,
-    int pri, int (*handler)(void *), void *arg, char *name)
+    int pri, int (*handler)(void *), void *arg, const char *name)
 {
 	struct dino_softc *sc = v;
 	volatile struct dino_regs *r = sc->sc_regs;
diff --git a/sys/arch/hppa/dev/elroyvar.h b/sys/arch/hppa/dev/elroyvar.h
index 157ad204a7d..f7c6d5c9dc9 100644
--- a/sys/arch/hppa/dev/elroyvar.h
+++ b/sys/arch/hppa/dev/elroyvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elroyvar.h,v 1.3 2007/06/17 14:51:21 kettenis Exp $	*/
+/*	$OpenBSD: elroyvar.h,v 1.4 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -50,7 +50,7 @@ int apic_intr(void *v);
 int apic_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp);
 const char *apic_intr_string(void *v, pci_intr_handle_t ih);
 void *apic_intr_establish(void *v, pci_intr_handle_t ih, int pri,
-    int (*handler)(void *), void *arg, char *name);
+    int (*handler)(void *), void *arg, const char *name);
 void apic_intr_disestablish(void *v, void *cookie);
 
 void elroy_write32(volatile u_int32_t *p, u_int32_t v);
diff --git a/sys/arch/hppa/include/pci_machdep.h b/sys/arch/hppa/include/pci_machdep.h
index 859bfc029dd..717fb519931 100644
--- a/sys/arch/hppa/include/pci_machdep.h
+++ b/sys/arch/hppa/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.4 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.5 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2003 Michael Shalayeff
@@ -53,7 +53,7 @@ struct hppa_pci_chipset_tag {
 			    pci_intr_handle_t *);
 	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish)(void *, pci_intr_handle_t,
-			    int, int (*)(void *), void *, char *);
+			    int, int (*)(void *), void *, const char *);
 	void		(*pc_intr_disestablish)(void *, void *);
 
 	void		*(*pc_alloc_parent)(struct device *,
diff --git a/sys/arch/hppa64/dev/apic.c b/sys/arch/hppa64/dev/apic.c
index d3904c48b24..d351c65d6f3 100644
--- a/sys/arch/hppa64/dev/apic.c
+++ b/sys/arch/hppa64/dev/apic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: apic.c,v 1.2 2005/05/22 01:42:49 mickey Exp $	*/
+/*	$OpenBSD: apic.c,v 1.3 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -88,7 +88,7 @@ apic_intr_string(void *v, pci_intr_handle_t ih)
 
 void *
 apic_intr_establish(void *v, pci_intr_handle_t ih,
-    int pri, int (*handler)(void *), void *arg, char *name)
+    int pri, int (*handler)(void *), void *arg, const char *name)
 {
 	/* struct elroy_softc *sc = v; */
 	/* volatile struct elroy_regs *r = sc->sc_regs; */
diff --git a/sys/arch/hppa64/dev/elroyvar.h b/sys/arch/hppa64/dev/elroyvar.h
index 3a4fcd35ae5..7a319483d07 100644
--- a/sys/arch/hppa64/dev/elroyvar.h
+++ b/sys/arch/hppa64/dev/elroyvar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: elroyvar.h,v 1.2 2008/04/20 18:41:45 kettenis Exp $	*/
+/*	$OpenBSD: elroyvar.h,v 1.3 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -50,7 +50,7 @@ int apic_intr(void *v);
 int apic_intr_map(struct pci_attach_args *pa, pci_intr_handle_t *ihp);
 const char *apic_intr_string(void *v, pci_intr_handle_t ih);
 void *apic_intr_establish(void *v, pci_intr_handle_t ih, int pri,
-    int (*handler)(void *), void *arg, char *name);
+    int (*handler)(void *), void *arg, const char *name);
 void apic_intr_disestablish(void *v, void *cookie);
 
 void elroy_write32(volatile u_int32_t *p, u_int32_t v);
diff --git a/sys/arch/hppa64/include/pci_machdep.h b/sys/arch/hppa64/include/pci_machdep.h
index 57e9bce3c3c..b92746d0da7 100644
--- a/sys/arch/hppa64/include/pci_machdep.h
+++ b/sys/arch/hppa64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.4 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.5 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Michael Shalayeff
@@ -44,7 +44,7 @@ struct hppa64_pci_chipset_tag {
 			    pci_intr_handle_t *);
 	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish)(void *, pci_intr_handle_t,
-			    int, int (*)(void *), void *, char *);
+			    int, int (*)(void *), void *, const char *);
 	void		(*pc_intr_disestablish)(void *, void *);
 
 	void		*(*pc_alloc_parent)(struct device *,
diff --git a/sys/arch/i386/i386/ioapic.c b/sys/arch/i386/i386/ioapic.c
index 60b08698845..3ea94c6252c 100644
--- a/sys/arch/i386/i386/ioapic.c
+++ b/sys/arch/i386/i386/ioapic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ioapic.c,v 1.21 2009/08/13 13:24:48 kettenis Exp $	*/
+/*	$OpenBSD: ioapic.c,v 1.22 2009/08/22 02:54:50 mk Exp $	*/
 /* 	$NetBSD: ioapic.c,v 1.7 2003/07/14 22:32:40 lukem Exp $	*/
 
 /*-
@@ -647,7 +647,7 @@ ioapic_hwunmask(struct pic *pic, int pin)
 
 void *
 apic_intr_establish(int irq, int type, int level, int (*ih_fun)(void *),
-    void *ih_arg, char *ih_what)
+    void *ih_arg, const char *ih_what)
 {
 	unsigned int ioapic = APIC_IRQ_APIC(irq);
 	unsigned int intr = APIC_IRQ_PIN(irq);
diff --git a/sys/arch/i386/include/i82093var.h b/sys/arch/i386/include/i82093var.h
index 42b2d72a39b..3359f5b8fc8 100644
--- a/sys/arch/i386/include/i82093var.h
+++ b/sys/arch/i386/include/i82093var.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82093var.h,v 1.8 2009/08/13 13:24:48 kettenis Exp $	*/
+/*	$OpenBSD: i82093var.h,v 1.9 2009/08/22 02:54:50 mk Exp $	*/
 /* $NetBSD: i82093var.h,v 1.1 2003/02/26 21:26:10 fvdl Exp $ */
 
 /*-
@@ -80,7 +80,8 @@ struct ioapic_softc {
 #define APIC_IRQ_APIC(x) ((x & APIC_INT_APIC_MASK) >> APIC_INT_APIC_SHIFT)
 #define APIC_IRQ_PIN(x) ((x & APIC_INT_PIN_MASK) >> APIC_INT_PIN_SHIFT)
 
-void   *apic_intr_establish(int, int, int, int (*)(void *), void *, char *); 
+void   *apic_intr_establish(int, int, int, int (*)(void *), void *,
+    const char *); 
 void	apic_intr_disestablish(void *);
 
 void	ioapic_print_redir(struct ioapic_softc *, char *, int);
diff --git a/sys/arch/i386/isa/isa_machdep.c b/sys/arch/i386/isa/isa_machdep.c
index 45ac6a62375..e3ac008cd7e 100644
--- a/sys/arch/i386/isa/isa_machdep.c
+++ b/sys/arch/i386/isa/isa_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.c,v 1.67 2009/03/10 15:03:17 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.c,v 1.68 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: isa_machdep.c,v 1.22 1997/06/12 23:57:32 thorpej Exp $	*/
 
 /*-
@@ -463,7 +463,7 @@ isa_intr_check(isa_chipset_tag_t ic, int irq, int type)
  */
 void *
 isa_intr_establish(isa_chipset_tag_t ic, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *ih_what)
+    int (*ih_fun)(void *), void *ih_arg, const char *ih_what)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {fakeintr};
diff --git a/sys/arch/i386/isa/isa_machdep.h b/sys/arch/i386/isa/isa_machdep.h
index 6f3e04cb27e..10c246610ea 100644
--- a/sys/arch/i386/isa/isa_machdep.h
+++ b/sys/arch/i386/isa/isa_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: isa_machdep.h,v 1.24 2008/12/11 17:07:14 oga Exp $	*/
+/*	$OpenBSD: isa_machdep.h,v 1.25 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: isa_machdep.h,v 1.7 1997/06/06 23:28:42 thorpej Exp $	*/
 
 /*-
@@ -104,7 +104,8 @@ void	isa_attach_hook(struct device *, struct device *,
 int	isa_intr_alloc(isa_chipset_tag_t, int, int, int *);
 int	isa_intr_check(isa_chipset_tag_t, int, int);
 void	*isa_intr_establish(isa_chipset_tag_t ic, int irq, int type,
-	    int level, int (*ih_fun)(void *), void *ih_arg, char *ih_what);
+	    int level, int (*ih_fun)(void *), void *ih_arg,
+	    const char *ih_what);
 void	isa_intr_disestablish(isa_chipset_tag_t ic, void *handler);
 
 /*
diff --git a/sys/arch/i386/pci/pci_machdep.c b/sys/arch/i386/pci/pci_machdep.c
index 777bd451fdd..186af6a30cc 100644
--- a/sys/arch/i386/pci/pci_machdep.c
+++ b/sys/arch/i386/pci/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.48 2009/04/29 18:28:37 kettenis Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.49 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.28 1997/06/06 23:29:17 thorpej Exp $	*/
 
 /*-
@@ -569,7 +569,7 @@ void	acpiprt_route_interrupt(int bus, int dev, int pin);
 
 void *
 pci_intr_establish(pci_chipset_tag_t pc, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *what)
+    int (*func)(void *), void *arg, const char *what)
 {
 	void *ret;
 	int bus, dev;
diff --git a/sys/arch/i386/pci/pci_machdep.h b/sys/arch/i386/pci/pci_machdep.h
index cf82ced70a3..543ff59c440 100644
--- a/sys/arch/i386/pci/pci_machdep.h
+++ b/sys/arch/i386/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.16 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.17 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: pci_machdep.h,v 1.7 1997/06/06 23:29:18 thorpej Exp $	*/
 
 /*
@@ -97,7 +97,7 @@ int		pci_intr_map(struct pci_attach_args *,
 #define		pci_intr_line(c, ih)	((ih).line)
 const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
-		    int, int (*)(void *), void *, char *);
+		    int, int (*)(void *), void *, const char *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 void		pci_decompose_tag(pci_chipset_tag_t, pcitag_t,
 		    int *, int *, int *);
diff --git a/sys/arch/macppc/dev/macintr.c b/sys/arch/macppc/dev/macintr.c
index 44631e8befa..f0f38b0a962 100644
--- a/sys/arch/macppc/dev/macintr.c
+++ b/sys/arch/macppc/dev/macintr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macintr.c,v 1.37 2009/06/09 01:12:38 deraadt Exp $	*/
+/*	$OpenBSD: macintr.c,v 1.38 2009/08/22 02:54:50 mk Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -221,7 +221,7 @@ fakeintr(void *arg)
  */
 void *
 macintr_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name)
+    int (*ih_fun)(void *), void *ih_arg, const char *name)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand;
diff --git a/sys/arch/macppc/dev/openpic.c b/sys/arch/macppc/dev/openpic.c
index 65b175a2a54..7bbacad8110 100644
--- a/sys/arch/macppc/dev/openpic.c
+++ b/sys/arch/macppc/dev/openpic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: openpic.c,v 1.54 2009/06/09 01:12:38 deraadt Exp $	*/
+/*	$OpenBSD: openpic.c,v 1.55 2009/08/22 02:54:50 mk Exp $	*/
 
 /*-
  * Copyright (c) 1995 Per Fogelstrom
@@ -147,7 +147,7 @@ extern void_f *pending_int_f;
 
 vaddr_t openpic_base;
 void * openpic_intr_establish( void * lcv, int irq, int type, int level,
-	int (*ih_fun)(void *), void *ih_arg, char *name);
+	int (*ih_fun)(void *), void *ih_arg, const char *name);
 void openpic_intr_disestablish( void *lcp, void *arg);
 #ifdef MULTIPROCESSOR
 intr_send_ipi_t openpic_send_ipi;
@@ -227,7 +227,7 @@ fakeintr(void *arg)
  */
 void *
 openpic_intr_establish(void *lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name)
+    int (*ih_fun)(void *), void *ih_arg, const char *name)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand;
diff --git a/sys/arch/macppc/include/autoconf.h b/sys/arch/macppc/include/autoconf.h
index 6e89313f9df..312898392ff 100644
--- a/sys/arch/macppc/include/autoconf.h
+++ b/sys/arch/macppc/include/autoconf.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.h,v 1.8 2008/09/16 04:20:42 drahn Exp $ */
+/*	$OpenBSD: autoconf.h,v 1.9 2009/08/22 02:54:50 mk Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -100,7 +100,7 @@ extern time_write_t *time_write;
 
 typedef int mac_intr_handle_t;
 typedef void     *(intr_establish_t)(void *, mac_intr_handle_t,
-    int, int, int (*func)(void *), void *, char *);
+    int, int, int (*func)(void *), void *, const char *);
 typedef void     (intr_disestablish_t)(void *, void *);
 struct cpu_info;
 typedef void     (intr_send_ipi_t)(struct cpu_info *, int);
diff --git a/sys/arch/macppc/macppc/machdep.c b/sys/arch/macppc/macppc/machdep.c
index 1698a7b296a..fb070245b49 100644
--- a/sys/arch/macppc/macppc/machdep.c
+++ b/sys/arch/macppc/macppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.113 2009/08/11 19:17:16 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.114 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -149,7 +149,7 @@ int power4e_get_eth_addr(void);
 void ppc_intr_setup(intr_establish_t *establish,
     intr_disestablish_t *disestablish);
 void *ppc_intr_establish(void *lcv, pci_intr_handle_t ih, int type,
-    int level, int (*func)(void *), void *arg, char *name);
+    int level, int (*func)(void *), void *arg, const char *name);
 int bus_mem_add_mapping(bus_addr_t bpa, bus_size_t size, int flags,
     bus_space_handle_t *bshp);
 bus_addr_t bus_space_unmap_p(bus_space_tag_t t, bus_space_handle_t bsh,
@@ -1034,7 +1034,7 @@ struct intrhand ppc_configed_intr[MAX_PRECONF_INTR];
 
 void *
 ppc_intr_establish(void *lcv, pci_intr_handle_t ih, int type, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	if (ppc_configed_intr_cnt < MAX_PRECONF_INTR) {
 		ppc_configed_intr[ppc_configed_intr_cnt].ih_fun = func;
diff --git a/sys/arch/macppc/pci/ht.c b/sys/arch/macppc/pci/ht.c
index 39735bcbe2f..5dfbc851b54 100644
--- a/sys/arch/macppc/pci/ht.c
+++ b/sys/arch/macppc/pci/ht.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ht.c,v 1.12 2009/03/29 22:58:31 kettenis Exp $	*/
+/*	$OpenBSD: ht.c,v 1.13 2009/08/22 02:54:50 mk Exp $	*/
 
 /*
  * Copyright (c) 2005 Mark Kettenis
@@ -45,7 +45,7 @@ int	 ht_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *ht_intr_string(void *, pci_intr_handle_t);
 int	 ht_intr_line(void *, pci_intr_handle_t);
 void	*ht_intr_establish(void *, pci_intr_handle_t, int, int (*)(void *),
-	     void *, char *);
+	     void *, const char *);
 void	 ht_intr_disestablish(void *, void *);
 
 int	 ht_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
@@ -353,7 +353,7 @@ ht_intr_line(void *cpv, pci_intr_handle_t ih)
 
 void *
 ht_intr_establish(void *cpv, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	return (*intr_establish_func)(cpv, ih, IST_LEVEL, level, func, arg,
 		name);
diff --git a/sys/arch/macppc/pci/macobio.c b/sys/arch/macppc/pci/macobio.c
index b73d41cb901..b335c558866 100644
--- a/sys/arch/macppc/pci/macobio.c
+++ b/sys/arch/macppc/pci/macobio.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macobio.c,v 1.17 2006/06/19 22:42:35 miod Exp $	*/
+/*	$OpenBSD: macobio.c,v 1.18 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: obio.c,v 1.6 1999/05/01 10:36:08 tsubai Exp $	*/
 
 /*-
@@ -52,7 +52,7 @@ int macobio_print(void *, const char *);
 void macobio_modem_power(int enable);
 
 void *undef_mac_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name);
+    int (*ih_fun)(void *), void *ih_arg, const char *name);
 void mac_intr_disestab(void *lcp, void *arg);
 
 struct macobio_softc {
@@ -229,7 +229,7 @@ macobio_print(void *aux, const char *macobio)
 
 void *
 undef_mac_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name)
+    int (*ih_fun)(void *), void *ih_arg, const char *name)
 {
 	printf("mac_intr_establish called, not yet inited\n");
 	return 0;
@@ -246,7 +246,7 @@ intr_disestablish_t *mac_intr_disestablish_func = mac_intr_disestab;
 
 void *
 mac_intr_establish(void * lcv, int irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *name)
+    int (*ih_fun)(void *), void *ih_arg, const char *name)
 {
 	return (*mac_intr_establish_func)(lcv, irq, type, level, ih_fun,
 	    ih_arg, name);
diff --git a/sys/arch/macppc/pci/mpcpcibus.c b/sys/arch/macppc/pci/mpcpcibus.c
index ed27df753ae..2b89fabe80e 100644
--- a/sys/arch/macppc/pci/mpcpcibus.c
+++ b/sys/arch/macppc/pci/mpcpcibus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibus.c,v 1.39 2009/05/03 21:30:09 kettenis Exp $ */
+/*	$OpenBSD: mpcpcibus.c,v 1.40 2009/08/22 02:54:50 mk Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom
@@ -68,7 +68,7 @@ int      mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *mpc_intr_string(void *, pci_intr_handle_t);
 int	mpc_intr_line(void *, pci_intr_handle_t);
 void     *mpc_intr_establish(void *, pci_intr_handle_t,
-            int, int (*func)(void *), void *, char *);
+            int, int (*func)(void *), void *, const char *);
 void     mpc_intr_disestablish(void *, void *);
 int      mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 u_int32_t mpc_gen_config_reg(void *cpv, pcitag_t tag, int offset);
@@ -907,7 +907,7 @@ mpc_intr_line(void *lcv, pci_intr_handle_t ih)
 
 void *
 mpc_intr_establish(void *lcv, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	return (*intr_establish_func)(lcv, ih, IST_LEVEL, level, func, arg,
 		name);
diff --git a/sys/arch/mvmeppc/mvmeppc/machdep.c b/sys/arch/mvmeppc/mvmeppc/machdep.c
index a998b943d4a..e06fc506035 100644
--- a/sys/arch/mvmeppc/mvmeppc/machdep.c
+++ b/sys/arch/mvmeppc/mvmeppc/machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: machdep.c,v 1.62 2009/08/11 19:17:17 miod Exp $	*/
+/*	$OpenBSD: machdep.c,v 1.63 2009/08/22 02:54:50 mk Exp $	*/
 /*	$NetBSD: machdep.c,v 1.4 1996/10/16 19:33:11 ws Exp $	*/
 
 /*
@@ -706,7 +706,7 @@ int ppc_configed_intr_cnt = 0;
 struct intrhand ppc_configed_intr[MAX_PRECONF_INTR];
 
 void *ppc_intr_establish(void *, pci_intr_handle_t, int, int, int (*)(void *),
-    void *, char *);
+    void *, const char *);
 void ppc_intr_setup(intr_establish_t *, intr_disestablish_t *);
 void ppc_intr_enable(int);
 int ppc_intr_disable(void);
@@ -719,7 +719,7 @@ ppc_intr_establish(lcv, ih, type, level, func, arg, name)
 	int level;
 	int (*func)(void *);
 	void *arg;
-	char *name;
+	const char *name;
 {
 	if (ppc_configed_intr_cnt < MAX_PRECONF_INTR) {
 		ppc_configed_intr[ppc_configed_intr_cnt].ih_fun = func;
diff --git a/sys/arch/mvmeppc/pci/mpcpcibr.c b/sys/arch/mvmeppc/pci/mpcpcibr.c
index 37e274409bb..a2056593b8f 100644
--- a/sys/arch/mvmeppc/pci/mpcpcibr.c
+++ b/sys/arch/mvmeppc/pci/mpcpcibr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mpcpcibr.c,v 1.19 2009/03/30 09:51:54 kettenis Exp $ */
+/*	$OpenBSD: mpcpcibr.c,v 1.20 2009/08/22 02:54:50 mk Exp $ */
 
 /*
  * Copyright (c) 2001 Steve Murphree, Jr.
@@ -72,7 +72,7 @@ int      mpc_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *mpc_intr_string(void *, pci_intr_handle_t);
 int	 mpc_intr_line(void *, pci_intr_handle_t);
 void     *mpc_intr_establish(void *, pci_intr_handle_t,
-    int, int (*)(void *), void *, char *);
+    int, int (*)(void *), void *, const char *);
 void     mpc_intr_disestablish(void *, void *);
 int      mpc_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 
@@ -543,7 +543,7 @@ mpc_intr_establish(lcv, ih, level, func, arg, name)
 	int level;
 	int (*func)(void *);
 	void *arg;
-	char *name;
+	const char *name;
 {
 	return (*intr_establish_func)(lcv, ih, IST_LEVEL, level, func, arg,
 		name);
diff --git a/sys/arch/powerpc/include/intr.h b/sys/arch/powerpc/include/intr.h
index bff4dee7633..455cebf38dd 100644
--- a/sys/arch/powerpc/include/intr.h
+++ b/sys/arch/powerpc/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.41 2009/06/09 01:12:38 deraadt Exp $ */
+/*	$OpenBSD: intr.h,v 1.42 2009/08/22 02:54:50 mk Exp $ */
 
 /*
  * Copyright (c) 1997 Per Fogelstrom, Opsycon AB and RTMX Inc, USA.
@@ -118,7 +118,7 @@ struct intrhand {
 	struct evcount	ih_count;
 	int		ih_level;
 	int		ih_irq;
-	char		*ih_what;
+	const char	*ih_what;
 };
 extern int ppc_configed_intr_cnt;
 #define MAX_PRECONF_INTR 16
diff --git a/sys/arch/powerpc/pci/pci_machdep.h b/sys/arch/powerpc/pci/pci_machdep.h
index 3ecddcbaa95..319c2f8223a 100644
--- a/sys/arch/powerpc/pci/pci_machdep.h
+++ b/sys/arch/powerpc/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.16 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.17 2009/08/22 02:54:51 mk Exp $	*/
 
 /*
  * Copyright (c) 1996 Carnegie-Mellon University.
@@ -59,7 +59,7 @@ struct ppc_pci_chipset {
 	const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
 	int		(*pc_intr_line)(void *, pci_intr_handle_t);
 	void		*(*pc_intr_establish)(void *, pci_intr_handle_t,
-			    int, int (*)(void *), void *, char *);
+			    int, int (*)(void *), void *, const char *);
 	void		(*pc_intr_disestablish)(void *, void *);
 	int		(*pc_ether_hw_addr)(struct ppc_pci_chipset *, u_int8_t *);
 };
diff --git a/sys/arch/sgi/include/intr.h b/sys/arch/sgi/include/intr.h
index 48a91f24e05..d8fb60d9d93 100644
--- a/sys/arch/sgi/include/intr.h
+++ b/sys/arch/sgi/include/intr.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intr.h,v 1.26 2009/06/12 19:52:15 miod Exp $ */
+/*	$OpenBSD: intr.h,v 1.27 2009/08/22 02:54:51 mk Exp $ */
 
 /*
  * Copyright (c) 2001-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -198,7 +198,7 @@ struct intrhand {
 	void	*ih_arg;
 	int	ih_level;
 	int	ih_irq;
-	char	*ih_what;
+	const char	*ih_what;
 	void	*frame;
 	struct evcount ih_count;
 };
diff --git a/sys/arch/sgi/localbus/macebus.c b/sys/arch/sgi/localbus/macebus.c
index 6b6136cf6a0..bf78d95fe58 100644
--- a/sys/arch/sgi/localbus/macebus.c
+++ b/sys/arch/sgi/localbus/macebus.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macebus.c,v 1.42 2009/07/22 21:28:42 miod Exp $ */
+/*	$OpenBSD: macebus.c,v 1.43 2009/08/22 02:54:51 mk Exp $ */
 
 /*
  * Copyright (c) 2000-2004 Opsycon AB  (www.opsycon.se)
@@ -448,7 +448,7 @@ static int fakeintr(void *a) {return 0;}
  */
 void *
 macebus_intr_establish(void *icp, u_long irq, int type, int level,
-    int (*ih_fun)(void *), void *ih_arg, char *ih_what)
+    int (*ih_fun)(void *), void *ih_arg, const char *ih_what)
 {
 	struct intrhand **p, *q, *ih;
 	static struct intrhand fakehand = {NULL, fakeintr};
diff --git a/sys/arch/sgi/localbus/macebus.h b/sys/arch/sgi/localbus/macebus.h
index 5ae13d282cd..01aaaaf796c 100644
--- a/sys/arch/sgi/localbus/macebus.h
+++ b/sys/arch/sgi/localbus/macebus.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macebus.h,v 1.12 2008/03/30 20:14:40 miod Exp $	*/
+/*	$OpenBSD: macebus.h,v 1.13 2009/08/22 02:54:51 mk Exp $	*/
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB (www.opsycon.com).
@@ -123,7 +123,7 @@ extern bus_space_t macebus_tag;
 extern struct machine_bus_dma_tag mace_bus_dma_tag;
 
 void   *macebus_intr_establish(void *, u_long, int, int, int (*)(void *),
-	    void *, char *);
+	    void *, const char *);
 void	macebus_intr_disestablish(void *, void *);
 
 #endif	/* _MACEBUS_H_ */
diff --git a/sys/arch/sgi/pci/macepcibridge.c b/sys/arch/sgi/pci/macepcibridge.c
index d03698c66ee..ad80218018e 100644
--- a/sys/arch/sgi/pci/macepcibridge.c
+++ b/sys/arch/sgi/pci/macepcibridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: macepcibridge.c,v 1.32 2009/08/09 12:36:33 miod Exp $ */
+/*	$OpenBSD: macepcibridge.c,v 1.33 2009/08/22 02:54:51 mk Exp $ */
 
 /*
  * Copyright (c) 2009 Miodrag Vallat.
@@ -86,7 +86,7 @@ void	 mace_pcibr_conf_write(void *, pcitag_t, int, pcireg_t);
 int	 mace_pcibr_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *mace_pcibr_intr_string(void *, pci_intr_handle_t);
 void	*mace_pcibr_intr_establish(void *, pci_intr_handle_t, int,
-	    int (*)(void *), void *, char *);
+	    int (*)(void *), void *, const char *);
 void	 mace_pcibr_intr_disestablish(void *, void *);
 int	 mace_pcibr_intr_line(void *, pci_intr_handle_t);
 int	 mace_pcibr_ppb_setup(void *, pcitag_t, bus_addr_t *, bus_addr_t *,
@@ -465,7 +465,7 @@ mace_pcibr_intr_string(void *lcv, pci_intr_handle_t ih)
 
 void *
 mace_pcibr_intr_establish(void *lcv, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	return
 	    macebus_intr_establish(NULL, ih, IST_LEVEL, level, func, arg, name);
diff --git a/sys/arch/sgi/pci/pci_machdep.h b/sys/arch/sgi/pci/pci_machdep.h
index 48a455213f9..68aa9694742 100644
--- a/sys/arch/sgi/pci/pci_machdep.h
+++ b/sys/arch/sgi/pci/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.7 2009/07/21 21:25:19 miod Exp $ */
+/*	$OpenBSD: pci_machdep.h,v 1.8 2009/08/22 02:54:51 mk Exp $ */
 
 /*
  * Copyright (c) 2003-2004 Opsycon AB  (www.opsycon.se / www.opsycon.com)
@@ -50,7 +50,7 @@ struct mips_pci_chipset {
     int		(*pc_intr_map)(struct pci_attach_args *, pci_intr_handle_t *);
     const char	*(*pc_intr_string)(void *, pci_intr_handle_t);
     void	*(*pc_intr_establish)(void *, pci_intr_handle_t,
-		    int, int (*)(void *), void *, char *);
+		    int, int (*)(void *), void *, const char *);
     void	(*pc_intr_disestablish)(void *, void *);
     int		(*pc_intr_line)(void *, pci_intr_handle_t);
 
diff --git a/sys/arch/sgi/xbow/xbridge.c b/sys/arch/sgi/xbow/xbridge.c
index 3b307d57215..f0ef4c2be6e 100644
--- a/sys/arch/sgi/xbow/xbridge.c
+++ b/sys/arch/sgi/xbow/xbridge.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: xbridge.c,v 1.45 2009/08/18 19:31:59 miod Exp $	*/
+/*	$OpenBSD: xbridge.c,v 1.46 2009/08/22 02:54:51 mk Exp $	*/
 
 /*
  * Copyright (c) 2008, 2009  Miodrag Vallat.
@@ -175,7 +175,7 @@ void	xbridge_conf_write(void *, pcitag_t, int, pcireg_t);
 int	xbridge_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 const char *xbridge_intr_string(void *, pci_intr_handle_t);
 void	*xbridge_intr_establish(void *, pci_intr_handle_t, int,
-	    int (*func)(void *), void *, char *);
+	    int (*func)(void *), void *, const char *);
 void	xbridge_intr_disestablish(void *, void *);
 int	xbridge_intr_line(void *, pci_intr_handle_t);
 int	xbridge_ppb_setup(void *, pcitag_t, bus_addr_t *, bus_addr_t *,
@@ -815,7 +815,7 @@ xbridge_intr_string(void *cookie, pci_intr_handle_t ih)
 
 void *
 xbridge_intr_establish(void *cookie, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	struct xbridge_bus *xb = (struct xbridge_bus *)cookie;
 	struct xbridge_intr *xi;
diff --git a/sys/arch/socppc/dev/socpcic.c b/sys/arch/socppc/dev/socpcic.c
index 1f95856b1f4..84d46878b6d 100644
--- a/sys/arch/socppc/dev/socpcic.c
+++ b/sys/arch/socppc/dev/socpcic.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: socpcic.c,v 1.3 2009/03/30 20:09:50 kettenis Exp $	*/
+/*	$OpenBSD: socpcic.c,v 1.4 2009/08/22 02:54:51 mk Exp $	*/
 
 /*
  * Copyright (c) 2008 Mark Kettenis
@@ -58,7 +58,7 @@ int	 socpcic_intr_map(void *, pcitag_t, int, int, pci_intr_handle_t *);
 const char *socpcic_intr_string(void *, pci_intr_handle_t);
 int	 socpcic_intr_line(void *, pci_intr_handle_t);
 void	*socpcic_intr_establish(void *, pci_intr_handle_t, int,
-	     int (*)(void *), void *, char *);
+	     int (*)(void *), void *, const char *);
 void	 socpcic_intr_disestablish(void *, void *);
 int	 socpcic_ether_hw_addr(struct ppc_pci_chipset *, u_int8_t *);
 
@@ -218,7 +218,7 @@ socpcic_intr_line(void *cpv, pci_intr_handle_t ih)
 
 void *
 socpcic_intr_establish(void *cpv, pci_intr_handle_t ih, int level,
-    int (*func)(void *), void *arg, char *name)
+    int (*func)(void *), void *arg, const char *name)
 {
 	return (intr_establish(ih, IST_LEVEL, level, func, arg, name));
 }
diff --git a/sys/arch/sparc64/dev/pci_machdep.c b/sys/arch/sparc64/dev/pci_machdep.c
index 21350559d46..1b3200bafc4 100644
--- a/sys/arch/sparc64/dev/pci_machdep.c
+++ b/sys/arch/sparc64/dev/pci_machdep.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.c,v 1.38 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.c,v 1.39 2009/08/22 02:54:51 mk Exp $	*/
 /*	$NetBSD: pci_machdep.c,v 1.22 2001/07/20 00:07:13 eeh Exp $	*/
 
 /*
@@ -419,7 +419,7 @@ pci_intr_establish(pc, ih, level, func, arg, what)
 	int level;
 	int (*func)(void *);
 	void *arg;
-	char *what;
+	const char *what;
 {
 	void *cookie;
 
diff --git a/sys/arch/sparc64/include/pci_machdep.h b/sys/arch/sparc64/include/pci_machdep.h
index c46bedd887e..112e8c0bd16 100644
--- a/sys/arch/sparc64/include/pci_machdep.h
+++ b/sys/arch/sparc64/include/pci_machdep.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pci_machdep.h,v 1.22 2009/07/20 23:40:43 miod Exp $	*/
+/*	$OpenBSD: pci_machdep.h,v 1.23 2009/08/22 02:54:51 mk Exp $	*/
 /* $NetBSD: pci_machdep.h,v 1.7 2001/07/20 00:07:14 eeh Exp $ */
 
 /*
@@ -86,7 +86,7 @@ int		pci_intr_map(struct pci_attach_args *, pci_intr_handle_t *);
 int		pci_intr_line(pci_chipset_tag_t, pci_intr_handle_t);
 const char	*pci_intr_string(pci_chipset_tag_t, pci_intr_handle_t);
 void		*pci_intr_establish(pci_chipset_tag_t, pci_intr_handle_t,
-				 int, int (*)(void *), void *, char *);
+				 int, int (*)(void *), void *, const char *);
 void		pci_intr_disestablish(pci_chipset_tag_t, void *);
 
 int		sparc64_pci_enumerate_bus(struct pci_softc *,