[src/trunk]: src/sys/external/bsd fix pci_intr_string

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0ccb0b402b37
branches:  trunk
changeset: 328232:0ccb0b402b37
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Mar 29 19:54:46 2014 +0000

description:
fix pci_intr_string

diffstat:

 sys/external/bsd/drm/dist/bsd-core/drm_irq.c |  3 ++-
 sys/external/bsd/drm2/pci/drm_pci.c          |  7 ++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 752c78bbd13d -r 0ccb0b402b37 sys/external/bsd/drm/dist/bsd-core/drm_irq.c
--- a/sys/external/bsd/drm/dist/bsd-core/drm_irq.c      Sat Mar 29 19:41:10 2014 +0000
+++ b/sys/external/bsd/drm/dist/bsd-core/drm_irq.c      Sat Mar 29 19:54:46 2014 +0000
@@ -186,6 +186,7 @@
 #ifdef __NetBSD__
        pci_intr_handle_t ih;
        const char *istr;
+       char intrbuf[PCI_INTRSTR_LEN];
 #endif
 
        if (dev->irq == 0 || dev->dev_private == NULL)
@@ -224,7 +225,7 @@
                retcode = ENOENT;
                goto err;
        }
-       istr = pci_intr_string(dev->pa.pa_pc, ih);
+       istr = pci_intr_string(dev->pa.pa_pc, ih, intrbuf, sizeof(intrbuf));
        dev->irqh = pci_intr_establish(dev->pa.pa_pc, ih, IPL_TTY,
            drm_irq_handler_wrap, dev);
        if (!dev->irqh) {
diff -r 752c78bbd13d -r 0ccb0b402b37 sys/external/bsd/drm2/pci/drm_pci.c
--- a/sys/external/bsd/drm2/pci/drm_pci.c       Sat Mar 29 19:41:10 2014 +0000
+++ b/sys/external/bsd/drm2/pci/drm_pci.c       Sat Mar 29 19:54:46 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: drm_pci.c,v 1.2 2014/03/18 18:20:43 riastradh Exp $    */
+/*     $NetBSD: drm_pci.c,v 1.3 2014/03/29 19:54:46 christos Exp $     */
 
 /*-
  * Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.2 2014/03/18 18:20:43 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_pci.c,v 1.3 2014/03/29 19:54:46 christos Exp $");
 
 #include <sys/types.h>
 #include <sys/errno.h>
@@ -197,11 +197,12 @@
        pci_intr_handle_t ih;
        const char *intrstr;
        void *ih_cookie;
+       char intrbuf[PCI_INTRSTR_LEN];
 
        if (pci_intr_map(pa, &ih))
                return -ENOENT;
 
-       intrstr = pci_intr_string(pa->pa_pc, ih);
+       intrstr = pci_intr_string(pa->pa_pc, ih, intrbuf, sizeof(intrbuf));
        ih_cookie = pci_intr_establish(pa->pa_pc, ih, IPL_DRM, handler, arg);
        if (ih_cookie == NULL) {
                aprint_error_dev(dev->dev,