summaryrefslogtreecommitdiff
path: root/sys/arch/amd64
diff options
context:
space:
mode:
authorMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
committerMichael Knudsen <mk@cvs.openbsd.org>2009-08-22 02:54:52 +0000
commit06e29584d413606b21c240635e12d7500b385ae5 (patch)
tree5e6f8a395a9c0030fc223059bb7a1b39529330c5 /sys/arch/amd64
parentc647754eb2c6d41408fe754bf7167383562e01b1 (diff)
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.)
Diffstat (limited to 'sys/arch/amd64')
-rw-r--r--sys/arch/amd64/amd64/intr.c4
-rw-r--r--sys/arch/amd64/include/intr.h4
-rw-r--r--sys/arch/amd64/include/pci_machdep.h4
-rw-r--r--sys/arch/amd64/pci/pci_machdep.c4
4 files changed, 8 insertions, 8 deletions
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;