[src/netbsd-6]: src Pull up revisions:

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

details:   https://anonhg.NetBSD.org/src/rev/b1500764ce94
branches:  netbsd-6
changeset: 774245:b1500764ce94
user:      jdc <jdc%NetBSD.org@localhost>
date:      Sun Jun 24 16:11:24 2012 +0000

description:
Pull up revisions:
  src/lib/libperfuse/perfuse_if.h revision 1.19
  src/usr.sbin/perfused/perfused.c revision 1.23
(requested by manu in ticket #348).

Add placeholder so that we can later add allbacks without breaking the
ABI

diffstat:

 lib/libperfuse/perfuse_if.h  |  3 ++-
 usr.sbin/perfused/perfused.c |  3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diffs (34 lines):

diff -r 2748960c8388 -r b1500764ce94 lib/libperfuse/perfuse_if.h
--- a/lib/libperfuse/perfuse_if.h       Sun Jun 24 16:07:12 2012 +0000
+++ b/lib/libperfuse/perfuse_if.h       Sun Jun 24 16:11:24 2012 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: perfuse_if.h,v 1.18 2011/12/28 17:33:53 manu Exp $ */
+/*  $NetBSD: perfuse_if.h,v 1.18.2.1 2012/06/24 16:11:24 jdc Exp $ */
 
 /*-
  *  Copyright (c) 2010-2011 Emmanuel Dreyfus. All rights reserved.
@@ -141,6 +141,7 @@
        perfuse_get_outhdr_fn pc_get_outhdr;
        perfuse_get_outpayload_fn pc_get_outpayload;
        perfuse_umount_fn pc_umount;
+       void *pc_reserved[16];
 };
 
 /* 
diff -r 2748960c8388 -r b1500764ce94 usr.sbin/perfused/perfused.c
--- a/usr.sbin/perfused/perfused.c      Sun Jun 24 16:07:12 2012 +0000
+++ b/usr.sbin/perfused/perfused.c      Sun Jun 24 16:11:24 2012 +0000
@@ -1,4 +1,4 @@
-/*  $NetBSD: perfused.c,v 1.22 2012/02/04 18:36:30 joerg Exp $ */
+/*  $NetBSD: perfused.c,v 1.22.2.1 2012/06/24 16:11:24 jdc Exp $ */
 
 /*-
  *  Copyright (c) 2010 Emmanuel Dreyfus. All rights reserved.
@@ -245,6 +245,7 @@
        /*
         * Initialize libperfuse, which will initialize libpuffs
         */
+       (void)memset(&pc, 0, sizeof(pc));
        pc.pc_new_msg = perfused_new_pb;
        pc.pc_xchg_msg = perfused_xchg_pb;
        pc.pc_destroy_msg = (perfuse_destroy_msg_fn)puffs_framebuf_destroy;