Module Name: src Committed By: sborrill Date: Tue May 8 15:51:14 UTC 2012
Modified Files: src/sys/arch/xen/xen [netbsd-5]: hypervisor.c Log Message: Fix XEN2 build after last pullup To generate a diff of this commit: cvs rdiff -u -r1.42.4.6 -r1.42.4.7 src/sys/arch/xen/xen/hypervisor.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/hypervisor.c diff -u src/sys/arch/xen/xen/hypervisor.c:1.42.4.6 src/sys/arch/xen/xen/hypervisor.c:1.42.4.7 --- src/sys/arch/xen/xen/hypervisor.c:1.42.4.6 Tue May 8 12:11:45 2012 +++ src/sys/arch/xen/xen/hypervisor.c Tue May 8 15:51:13 2012 @@ -1,4 +1,4 @@ -/* $NetBSD: hypervisor.c,v 1.42.4.6 2012/05/08 12:11:45 sborrill Exp $ */ +/* $NetBSD: hypervisor.c,v 1.42.4.7 2012/05/08 15:51:13 sborrill Exp $ */ /* * Copyright (c) 2005 Manuel Bouyer. @@ -63,7 +63,7 @@ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.42.4.6 2012/05/08 12:11:45 sborrill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: hypervisor.c,v 1.42.4.7 2012/05/08 15:51:13 sborrill Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -230,6 +230,7 @@ hypervisor_attach(device_t parent, devic { #ifdef XEN3 int xen_version; + char xen_extra_version[XEN_EXTRAVERSION_LEN]; #endif #if NPCI >0 #ifndef XEN3 @@ -239,7 +240,6 @@ hypervisor_attach(device_t parent, devic #endif /* NPCI */ union hypervisor_attach_cookie hac; - char xen_extra_version[XEN_EXTRAVERSION_LEN]; xenkernfs_init();