CVS commit: [netbsd-5] src/sys/arch/xen/xen

[Soren Jacobsen]

Module Name:    src
Committed By:   snj
Date:           Mon Feb 22 04:36:52 UTC 2010

Modified Files:
        src/sys/arch/xen/xen [netbsd-5]: isa_machdep.c pciide_machdep.c

Log Message:
Pull up following revision(s) (requested by bouyer in ticket #1299):
        sys/arch/xen/xen/isa_machdep.c: revision 1.23
        sys/arch/xen/xen/pciide_machdep.c: revision 1.17
Enlarge temporary buffer, so that event counter's name is not truncated
for ioapic interrupts.


To generate a diff of this commit:
cvs rdiff -u -r1.12.6.1 -r1.12.6.2 src/sys/arch/xen/xen/isa_machdep.c
cvs rdiff -u -r1.11.6.1 -r1.11.6.2 src/sys/arch/xen/xen/pciide_machdep.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/xen/xen/isa_machdep.c
diff -u src/sys/arch/xen/xen/isa_machdep.c:1.12.6.1 src/sys/arch/xen/xen/isa_machdep.c:1.12.6.2
--- src/sys/arch/xen/xen/isa_machdep.c:1.12.6.1	Sun Oct  4 00:03:20 2009
+++ src/sys/arch/xen/xen/isa_machdep.c	Mon Feb 22 04:36:52 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: isa_machdep.c,v 1.12.6.1 2009/10/04 00:03:20 snj Exp $	*/
+/*	$NetBSD: isa_machdep.c,v 1.12.6.2 2010/02/22 04:36:52 snj Exp $	*/
 /*	NetBSD isa_machdep.c,v 1.11 2004/06/20 18:04:08 thorpej Exp 	*/
 
 /*-
@@ -66,7 +66,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.12.6.1 2009/10/04 00:03:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.12.6.2 2010/02/22 04:36:52 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -153,7 +153,7 @@
 	void *ih_arg;
 {
 	int evtch;
-	char evname[8];
+	char evname[16];
 	struct xen_intr_handle ih;
 #if NIOAPIC > 0
 	struct ioapic_softc *pic = NULL;

Index: src/sys/arch/xen/xen/pciide_machdep.c
diff -u src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.1 src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.2
--- src/sys/arch/xen/xen/pciide_machdep.c:1.11.6.1	Sun Oct  4 00:03:20 2009
+++ src/sys/arch/xen/xen/pciide_machdep.c	Mon Feb 22 04:36:52 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide_machdep.c,v 1.11.6.1 2009/10/04 00:03:20 snj Exp $	*/
+/*	$NetBSD: pciide_machdep.c,v 1.11.6.2 2010/02/22 04:36:52 snj Exp $	*/
 
 /*
  * Copyright (c) 1998 Christopher G. Demetriou.  All rights reserved.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.11.6.1 2009/10/04 00:03:20 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_machdep.c,v 1.11.6.2 2010/02/22 04:36:52 snj Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -72,7 +72,7 @@
 	void *arg;
 {
 	struct pintrhand *ih;
-	char evname[8];
+	char evname[16];
         struct xen_intr_handle xenih;
 #if NIOAPIC > 0
 	struct ioapic_softc *pic = NULL;