CVS commit: src/crypto/external/bsd/netpgp/dist/src/lib
Module Name:src Committed By: agc Date: Thu Sep 2 07:31:16 UTC 2010 Modified Files: src/crypto/external/bsd/netpgp/dist/src/lib: netpgp.c Log Message: If we get passed a key which has no subuids, sigs, fingerprint or any other data, and has been revoked, don't even attempt to print it out. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 \ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c diff -u src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.72 src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.73 --- src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c:1.72 Thu Sep 2 06:00:12 2010 +++ src/crypto/external/bsd/netpgp/dist/src/lib/netpgp.c Thu Sep 2 07:31:16 2010 @@ -34,7 +34,7 @@ #if defined(__NetBSD__) __COPYRIGHT("@(#) Copyright (c) 2009 The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$NetBSD: netpgp.c,v 1.72 2010/09/02 06:00:12 agc Exp $"); +__RCSID("$NetBSD: netpgp.c,v 1.73 2010/09/02 07:31:16 agc Exp $"); #endif #include @@ -564,6 +564,11 @@ (void) fprintf(stderr, "formatobj: json is '%s'\n", s); free(s); } + if (obj->c == 2 && obj->value.v[1].type == MJ_STRING && + strcmp(obj->value.v[1].value.s, "[REVOKED]") == 0) { + /* whole key has been rovoked - just return */ + return; + } pobj(fp, &obj->value.v[mj_object_find(obj, "header", 0, 2) + 1], 0); p(fp, " ", NULL); pobj(fp, &obj->value.v[mj_object_find(obj, "key bits", 0, 2) + 1], 0);
CVS commit: src/lib/libperfuse
Module Name:src Committed By: manu Date: Thu Sep 2 08:58:06 UTC 2010 Modified Files: src/lib/libperfuse: ops.c Log Message: - only remove queued requests once they are executed, not when they are set to be scheduled later - remove an unused argument to make lint happy To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/lib/libperfuse/ops.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libperfuse/ops.c diff -u src/lib/libperfuse/ops.c:1.5 src/lib/libperfuse/ops.c:1.6 --- src/lib/libperfuse/ops.c:1.5 Wed Sep 1 14:57:24 2010 +++ src/lib/libperfuse/ops.c Thu Sep 2 08:58:06 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: ops.c,v 1.5 2010/09/01 14:57:24 manu Exp $ */ +/* $NetBSD: ops.c,v 1.6 2010/09/02 08:58:06 manu Exp $ */ /*- * Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved. @@ -49,8 +49,7 @@ static int node_lookup_common(struct puffs_usermount *, puffs_cookie_t, const char*, struct puffs_node **); static int node_mk_common(struct puffs_usermount *, puffs_cookie_t, -struct puffs_newinfo *, const struct puffs_cn *pcn, -const struct vattr *, perfuse_msg_t *); +struct puffs_newinfo *, const struct puffs_cn *pcn, perfuse_msg_t *); static const char *basename_r(const char *); static ssize_t fuse_to_dirent(struct puffs_usermount *, puffs_cookie_t, struct fuse_dirent *, size_t); @@ -241,12 +240,11 @@ * perfuse_node_symlink */ static int -node_mk_common(pu, opc, pni, pcn, vap, pm) +node_mk_common(pu, opc, pni, pcn, pm) struct puffs_usermount *pu; puffs_cookie_t opc; struct puffs_newinfo *pni; const struct puffs_cn *pcn; - const struct vattr *vap; perfuse_msg_t *pm; { struct perfuse_state *ps; @@ -545,6 +543,7 @@ #endif puffs_cc_yield(pcq.pcq_cc); + TAILQ_REMOVE(&pnd->pnd_pcq, &pcq, pcq_next); #ifdef PERFUSE_DEBUG if (perfuse_diagflags & PDF_REQUEUE) @@ -576,14 +575,12 @@ if (pcq->pcq_type != type) continue; - puffs_cc_schedule(pcq->pcq_cc); - TAILQ_REMOVE(&pnd->pnd_pcq, pcq, pcq_next); - #ifdef PERFUSE_DEBUG if (perfuse_diagflags & PDF_REQUEUE) DPRINTF("%s: SCHEDULE opc = %p, pcc = %p\n", __func__, (void *)opc, pcq->pcq_cc); #endif + puffs_cc_schedule(pcq->pcq_cc); if (++dequeued == max) break; @@ -970,7 +967,7 @@ fmi->umask = 0; /* Seems unused bu libfuse */ (void)strlcpy((char *)(void *)(fmi + 1), path, len - sizeof(*fmi)); - return node_mk_common(pu, opc, pni, pcn, vap, pm); + return node_mk_common(pu, opc, pni, pcn, pm); } @@ -1758,7 +1755,7 @@ fmi->umask = 0; /* Seems unused bu libfuse? */ (void)strlcpy((char *)(void *)(fmi + 1), path, len - sizeof(*fmi)); - return node_mk_common(pu, opc, pni, pcn, vap, pm); + return node_mk_common(pu, opc, pni, pcn, pm); } @@ -1848,7 +1845,7 @@ np += path_len; (void)strlcpy(np, link_target, linkname_len); - return node_mk_common(pu, opc, pni, pcn_src, vap, pm); + return node_mk_common(pu, opc, pni, pcn_src, pm); } int
CVS commit: src/tests/rump/rumpkern
Module Name:src Committed By: pooka Date: Thu Sep 2 09:57:34 UTC 2010 Modified Files: src/tests/rump/rumpkern: t_lwproc.c Log Message: check that curlwp for an implicit context is NULL To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/rump/rumpkern/t_lwproc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/rump/rumpkern/t_lwproc.c diff -u src/tests/rump/rumpkern/t_lwproc.c:1.1 src/tests/rump/rumpkern/t_lwproc.c:1.2 --- src/tests/rump/rumpkern/t_lwproc.c:1.1 Wed Sep 1 21:18:14 2010 +++ src/tests/rump/rumpkern/t_lwproc.c Thu Sep 2 09:57:34 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: t_lwproc.c,v 1.1 2010/09/01 21:18:14 pooka Exp $ */ +/* $NetBSD: t_lwproc.c,v 1.2 2010/09/02 09:57:34 pooka Exp $ */ /* * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -205,6 +205,21 @@ } } +ATF_TC(nolwp); +ATF_TC_HEAD(nolwp, tc) +{ + + atf_tc_set_md_var(tc, "descr", "check that curlwp for an implicit " + "context is NULL"); +} + +ATF_TC_BODY(nolwp, tc) +{ + + rump_init(); + ATF_REQUIRE_EQ(rump_pub_lwproc_curlwp(), NULL); +} + ATF_TP_ADD_TCS(tp) { @@ -213,6 +228,7 @@ ATF_TP_ADD_TC(tp, inherit); ATF_TP_ADD_TC(tp, lwps); ATF_TP_ADD_TC(tp, nolwprelease); + ATF_TP_ADD_TC(tp, nolwp); return atf_no_error(); }
CVS commit: src
Module Name:src Committed By: pooka Date: Thu Sep 2 12:29:49 UTC 2010 Modified Files: src/distrib/sets/lists/comp: mi src/lib/librump: Makefile Added Files: src/lib/librump: rump_lwproc.3 Log Message: document rump_lwproc To generate a diff of this commit: cvs rdiff -u -r1.1505 -r1.1506 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.2 -r1.3 src/lib/librump/Makefile cvs rdiff -u -r0 -r1.1 src/lib/librump/rump_lwproc.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1505 src/distrib/sets/lists/comp/mi:1.1506 --- src/distrib/sets/lists/comp/mi:1.1505 Fri Aug 27 16:29:13 2010 +++ src/distrib/sets/lists/comp/mi Thu Sep 2 12:29:49 2010 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1505 2010/08/27 16:29:13 tron Exp $ +# $NetBSD: mi,v 1.1506 2010/09/02 12:29:49 pooka Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -7861,6 +7861,7 @@ ./usr/share/man/cat3/rresvport_af.0 comp-c-catman .cat ./usr/share/man/cat3/rsa.0 comp-obsolete obsolete ./usr/share/man/cat3/rump.0 comp-c-catman .cat +./usr/share/man/cat3/rump_lwproc.0 comp-c-catman .cat ./usr/share/man/cat3/rumpuser.0 comp-c-catman .cat ./usr/share/man/cat3/ruserok.0 comp-c-catman .cat ./usr/share/man/cat3/savetty.0 comp-c-catman .cat @@ -13748,6 +13749,7 @@ ./usr/share/man/html3/rresvport.html comp-c-htmlman html ./usr/share/man/html3/rresvport_af.html comp-c-htmlman html ./usr/share/man/html3/rump.html comp-c-htmlman html +./usr/share/man/html3/rump_lwproc.html comp-c-htmlman html ./usr/share/man/html3/rumpuser.html comp-c-htmlman html ./usr/share/man/html3/ruserok.html comp-c-htmlman html ./usr/share/man/html3/savetty.html comp-c-htmlman html @@ -19643,6 +19645,7 @@ ./usr/share/man/man3/rresvport_af.3 comp-c-man .man ./usr/share/man/man3/rsa.3 comp-obsolete obsolete ./usr/share/man/man3/rump.3 comp-c-man .man +./usr/share/man/man3/rump_lwproc.3 comp-c-man .man ./usr/share/man/man3/rumpuser.3 comp-c-man .man ./usr/share/man/man3/ruserok.3 comp-c-man .man ./usr/share/man/man3/savetty.3 comp-c-man .man Index: src/lib/librump/Makefile diff -u src/lib/librump/Makefile:1.2 src/lib/librump/Makefile:1.3 --- src/lib/librump/Makefile:1.2 Thu Feb 12 13:20:17 2009 +++ src/lib/librump/Makefile Thu Sep 2 12:29:49 2010 @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.2 2009/02/12 13:20:17 lukem Exp $ +# $NetBSD: Makefile,v 1.3 2010/09/02 12:29:49 pooka Exp $ # RUMPTOP= ${.CURDIR}/../../sys/rump LIBDPLIBS+= rumpuser ${.CURDIR}/../librumpuser -MAN= rump.3 +MAN= rump.3 rump_lwproc.3 WARNS= 3 # XXX: kernel isn't ready for -Wsign-compare Added files: Index: src/lib/librump/rump_lwproc.3 diff -u /dev/null src/lib/librump/rump_lwproc.3:1.1 --- /dev/null Thu Sep 2 12:29:50 2010 +++ src/lib/librump/rump_lwproc.3 Thu Sep 2 12:29:49 2010 @@ -0,0 +1,119 @@ +.\" $NetBSD: rump_lwproc.3,v 1.1 2010/09/02 12:29:49 pooka Exp $ +.\" +.\" Copyright (c) 2010 Antti Kantee. All rights reserved. +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\"notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\"notice, this list of conditions and the following disclaimer in the +.\"documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd September 2, 2010 +.Dt RUMP_LWPROC 3 +.Os +.Sh NAME +.Nm rump_lwproc +.Nd rump process/lwp management +.Sh LIBRARY +rump kernel (librump, \-lrump) +.Sh SYNOPSIS +.In rump/rump.h +.Ft int +.Fn rump_pub_lwproc_newproc +.Ft int +.Fn rump_pub_lwproc_newlwp "pid_t pid" +.Ft void +.Fn rump_pub_lwproc_switch "struct lwp *l" +.Ft void +.Fn rump_pub_lwproc_releaselwp +.Ft struct lwp * +.Fn rump_pub_lwproc_curlwp +.Sh DESCRIPTION +In a normal operating system model a process
CVS commit: src/tests/fs/nfs/nfsservice
Module Name:src Committed By: pooka Date: Thu Sep 2 15:13:56 UTC 2010 Modified Files: src/tests/fs/nfs/nfsservice: rumpnfsd.c Log Message: Actually use the imagename parameter. Also, fail with err instead of atf_tc_fail since we are not directly under the control of atf. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/fs/nfs/nfsservice/rumpnfsd.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/fs/nfs/nfsservice/rumpnfsd.c diff -u src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.4 src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.5 --- src/tests/fs/nfs/nfsservice/rumpnfsd.c:1.4 Thu Aug 5 16:47:59 2010 +++ src/tests/fs/nfs/nfsservice/rumpnfsd.c Thu Sep 2 15:13:55 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: rumpnfsd.c,v 1.4 2010/08/05 16:47:59 pooka Exp $ */ +/* $NetBSD: rumpnfsd.c,v 1.5 2010/09/02 15:13:55 pooka Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -93,10 +93,10 @@ rump_sys_mkdir("/var/db", 0777); if (ffs_fstest_newfs(NULL, &fsarg, - FSTEST_IMGNAME, FSTEST_IMGSIZE, NULL) != 0) - atf_tc_fail("newfs failed"); + imagename, FSTEST_IMGSIZE, NULL) != 0) + err(1, "newfs failed"); if (ffs_fstest_mount(NULL, fsarg, exportpath, 0) != 0) - atf_tc_fail("mount failed"); + err(1, "mount failed"); #if 0 /*
CVS commit: src/lib/librump
Module Name:src Committed By: pooka Date: Thu Sep 2 15:24:34 UTC 2010 Modified Files: src/lib/librump: rump.3 Log Message: xfer rump_lwproc To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/lib/librump/rump.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/librump/rump.3 diff -u src/lib/librump/rump.3:1.3 src/lib/librump/rump.3:1.4 --- src/lib/librump/rump.3:1.3 Mon Aug 30 11:37:52 2010 +++ src/lib/librump/rump.3 Thu Sep 2 15:24:34 2010 @@ -1,4 +1,4 @@ -.\" $NetBSD: rump.3,v 1.3 2010/08/30 11:37:52 wiz Exp $ +.\" $NetBSD: rump.3,v 1.4 2010/09/02 15:24:34 pooka Exp $ .\" .\" Copyright (c) 2008-2010 Antti Kantee. All rights reserved. .\" @@ -141,6 +141,7 @@ kernel module boundaries. .Sh SEE ALSO .Xr p2k 3 , +.Xr rump_lwproc 3 , .Xr rumpuser 3 , .Xr ukfs 3 .Rs
CVS commit: src/tests/dev/scsipi
Module Name:src Committed By: he Date: Thu Sep 2 16:55:15 UTC 2010 Modified Files: src/tests/dev/scsipi: Makefile Log Message: Re-order libraries so that this links statically as well. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/dev/scsipi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/dev/scsipi/Makefile diff -u src/tests/dev/scsipi/Makefile:1.1 src/tests/dev/scsipi/Makefile:1.2 --- src/tests/dev/scsipi/Makefile:1.1 Tue Aug 24 11:29:45 2010 +++ src/tests/dev/scsipi/Makefile Thu Sep 2 16:55:15 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2010/08/24 11:29:45 pooka Exp $ +# $NetBSD: Makefile,v 1.2 2010/09/02 16:55:15 he Exp $ # .include @@ -7,7 +7,7 @@ TESTS_C= t_cd -LDADD+= -lrumpdev_scsipi -lrumpdev_scsitest -lrumpdev_disk -lrumpdev -lrumpvfs +LDADD+= -lrumpdev_scsitest -lrumpdev_scsipi -lrumpdev_disk -lrumpdev -lrumpvfs LDADD+= -lrump LDADD+= -lrumpuser -lpthread
CVS commit: src/sys/lib/libsa
Module Name:src Committed By: christos Date: Thu Sep 2 17:10:15 UTC 2010 Modified Files: src/sys/lib/libsa: loadfile_elf32.c Log Message: PR/43830: Valery Ushakov: libsa/loadfile_elf32.c loads .shstrtab into unallocated memory. Don't load if counting. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/sys/lib/libsa/loadfile_elf32.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/lib/libsa/loadfile_elf32.c diff -u src/sys/lib/libsa/loadfile_elf32.c:1.25 src/sys/lib/libsa/loadfile_elf32.c:1.26 --- src/sys/lib/libsa/loadfile_elf32.c:1.25 Fri Mar 12 16:43:11 2010 +++ src/sys/lib/libsa/loadfile_elf32.c Thu Sep 2 13:10:14 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: loadfile_elf32.c,v 1.25 2010/03/12 21:43:11 darran Exp $ */ +/* $NetBSD: loadfile_elf32.c,v 1.26 2010/09/02 17:10:14 christos Exp $ */ /*- * Copyright (c) 1997, 2008 The NetBSD Foundation, Inc. @@ -411,36 +411,40 @@ * First load the section names section. */ if (boot_load_ctf && (elf->e_shstrndx != 0)) { - if (lseek(fd, shp[elf->e_shstrndx].sh_offset, - SEEK_SET) == -1) { - WARN(("lseek symbols")); - goto freeshp; - } - nr = READ(fd, maxp, shp[elf->e_shstrndx].sh_size); - if (nr == -1) { - WARN(("read symbols")); - goto freeshp; - } - if (nr != (ssize_t)shp[elf->e_shstrndx].sh_size) { - errno = EIO; - WARN(("read symbols")); - goto freeshp; - } - - shstr = ALLOC(shp[elf->e_shstrndx].sh_size); - if (lseek(fd, shp[elf->e_shstrndx].sh_offset, - SEEK_SET) == -1) { - WARN(("lseek symbols")); - goto freeshp; - } - nr = read(fd, shstr, shp[elf->e_shstrndx].sh_size); - if (nr == -1) { - WARN(("read symbols")); - goto freeshp; - } + if (flags & LOAD_SYM) { +if (lseek(fd, shp[elf->e_shstrndx].sh_offset, +SEEK_SET) == -1) { + WARN(("lseek symbols")); + goto freeshp; +} +nr = READ(fd, maxp, +shp[elf->e_shstrndx].sh_size); +if (nr == -1) { + WARN(("read symbols")); + goto freeshp; +} +if (nr != +(ssize_t)shp[elf->e_shstrndx].sh_size) { + errno = EIO; + WARN(("read symbols")); + goto freeshp; +} - shp[elf->e_shstrndx].sh_offset = maxp - elfp; - maxp += roundup(shp[elf->e_shstrndx].sh_size, ELFROUND); +shstr = ALLOC(shp[elf->e_shstrndx].sh_size); +if (lseek(fd, shp[elf->e_shstrndx].sh_offset, +SEEK_SET) == -1) { + WARN(("lseek symbols")); + goto freeshp; +} +nr = read(fd, shstr, +shp[elf->e_shstrndx].sh_size); +if (nr == -1) { + WARN(("read symbols")); + goto freeshp; +} + } + shp[elf->e_shstrndx].sh_offset = maxp - elfp; + maxp += roundup(shp[elf->e_shstrndx].sh_size, ELFROUND); } /*
CVS commit: src/sys/arch/xen/include
Module Name:src Committed By: cegger Date: Fri Sep 3 06:07:24 UTC 2010 Modified Files: src/sys/arch/xen/include: xenio.h xenio3.h Log Message: match header protection with filename To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/xen/include/xenio.h cvs rdiff -u -r1.2 -r1.3 src/sys/arch/xen/include/xenio3.h 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/include/xenio.h diff -u src/sys/arch/xen/include/xenio.h:1.6 src/sys/arch/xen/include/xenio.h:1.7 --- src/sys/arch/xen/include/xenio.h:1.6 Sun Feb 17 16:21:19 2008 +++ src/sys/arch/xen/include/xenio.h Fri Sep 3 06:07:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: xenio.h,v 1.6 2008/02/17 16:21:19 bouyer Exp $ */ +/* $NetBSD: xenio.h,v 1.7 2010/09/03 06:07:24 cegger Exp $ */ /** * privcmd.h @@ -27,8 +27,8 @@ * IN THE SOFTWARE. */ -#ifndef __XEN_XENIO3_H__ -#define __XEN_XENIO3_H__ +#ifndef __XEN_XENIO_H__ +#define __XEN_XENIO_H__ /* Interface to /proc/xen/privcmd */ @@ -112,4 +112,4 @@ /* EVTCHN_UNBIND: Unbind from the specified event-channel port. */ #define EVTCHN_UNBIND _IOW('E', 3, unsigned long) -#endif /* __XEN_XENIO3_H__ */ +#endif /* __XEN_XENIO_H__ */ Index: src/sys/arch/xen/include/xenio3.h diff -u src/sys/arch/xen/include/xenio3.h:1.2 src/sys/arch/xen/include/xenio3.h:1.3 --- src/sys/arch/xen/include/xenio3.h:1.2 Sun Feb 17 16:21:19 2008 +++ src/sys/arch/xen/include/xenio3.h Fri Sep 3 06:07:24 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: xenio3.h,v 1.2 2008/02/17 16:21:19 bouyer Exp $ */ +/* $NetBSD: xenio3.h,v 1.3 2010/09/03 06:07:24 cegger Exp $ */ /** * evtchn.h * @@ -28,8 +28,8 @@ * IN THE SOFTWARE. */ -#ifndef __XEN_XENIO_H__ -#define __XEN_XENIO_H__ +#ifndef __XEN_XENIO3_H__ +#define __XEN_XENIO3_H__ /* * Bind a fresh port to VIRQ @virq. @@ -86,4 +86,4 @@ #define IOCTL_EVTCHN_RESET\ _IO('E', 9) -#endif /* __XEN_XENIO_H__ */ +#endif /* __XEN_XENIO3_H__ */