Module Name: src
Committed By: ozaki-r
Date: Fri Apr 4 16:41:55 UTC 2014
Modified Files:
src/sys/arch/mips/rmi: rmixl_pcix.c
Log Message:
Adjust to pci_intr_string signature
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/rmi/rmixl_pcix.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/rmi/rmixl_pcix.c
diff -u src/sys/arch/mips/rmi/rmixl_pcix.c:1.11 src/sys/arch/mips/rmi/rmixl_pcix.c:1.12
--- src/sys/arch/mips/rmi/rmixl_pcix.c:1.11 Tue Mar 11 08:19:45 2014
+++ src/sys/arch/mips/rmi/rmixl_pcix.c Fri Apr 4 16:41:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $ */
+/* $NetBSD: rmixl_pcix.c,v 1.12 2014/04/04 16:41:55 ozaki-r Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.11 2014/03/11 08:19:45 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_pcix.c,v 1.12 2014/04/04 16:41:55 ozaki-r Exp $");
#include "opt_pci.h"
#include "pci.h"
@@ -242,7 +242,8 @@ static void rmixl_pcix_conf_write(void *
static int rmixl_pcix_intr_map(const struct pci_attach_args *,
pci_intr_handle_t *);
static const char *
- rmixl_pcix_intr_string(void *, pci_intr_handle_t);
+ rmixl_pcix_intr_string(void *, pci_intr_handle_t,
+ char *, size_t);
static const struct evcnt *
rmixl_pcix_intr_evcnt(void *, pci_intr_handle_t);
static pci_intr_handle_t
@@ -787,7 +788,7 @@ rmixl_pcix_intr_map(const struct pci_att
}
const char *
-rmixl_pcix_intr_string(void *v, pci_intr_handle_t pih)
+rmixl_pcix_intr_string(void *v, pci_intr_handle_t pih, char *buf, size_t len)
{
u_int bitno, irq;
@@ -797,7 +798,8 @@ rmixl_pcix_intr_string(void *v, pci_intr
panic("%s: cpu %#x not supported\n",
__func__, mips_options.mips_cpu_id);
- return rmixl_intr_string(RMIXL_IRT_VECTOR(irq));
+ strlcpy(buf, rmixl_intr_string(RMIXL_IRT_VECTOR(irq)), len);
+ return buf;
}
const struct evcnt *
