[src/trunk]: src/external/cddl/osnet I've NFI why this code has userspace stu...

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

details:   https://anonhg.NetBSD.org/src/rev/06bad2d3460c
branches:  trunk
changeset: 783648:06bad2d3460c
user:      dsl <dsl%NetBSD.org@localhost>
date:      Wed Jan 02 16:31:24 2013 +0000

description:
I've NFI why this code has userspace stuff playing with 'struct proc *'
  nor why it uses &p0 as a magic constant (rather than NULL).
Re-instate the definition of p0, but enable the 'fake' definition
  of 'struct proc' if the relevant part of sys/proc.h seems to have
  been #if'ed away.
Should fix the build.

diffstat:

 external/cddl/osnet/lib/libzpool/kernel.c |   6 +++---
 external/cddl/osnet/sys/sys/zfs_context.h |  10 ++++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diffs (53 lines):

diff -r a2bdbc6b763d -r 06bad2d3460c external/cddl/osnet/lib/libzpool/kernel.c
--- a/external/cddl/osnet/lib/libzpool/kernel.c Wed Jan 02 15:50:34 2013 +0000
+++ b/external/cddl/osnet/lib/libzpool/kernel.c Wed Jan 02 16:31:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kernel.c,v 1.6 2013/01/01 19:03:26 dsl Exp $  */
+/*     $NetBSD: kernel.c,v 1.7 2013/01/02 16:31:24 dsl Exp $  */
 
 /*
  * CDDL HEADER START
@@ -29,7 +29,7 @@
 #pragma ident  "%Z%%M% %I%     %E% SMI"
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: kernel.c,v 1.6 2013/01/01 19:03:26 dsl Exp $");
+__RCSID("$NetBSD: kernel.c,v 1.7 2013/01/02 16:31:24 dsl Exp $");
 
 #include <sys/zfs_context.h>
 #include <sys/sysctl.h>
@@ -65,7 +65,7 @@
 };
 
 /* this only exists to have its address taken */
-// struct proc p0;
+struct proc p0;
 
 /*
  * =========================================================================
diff -r a2bdbc6b763d -r 06bad2d3460c external/cddl/osnet/sys/sys/zfs_context.h
--- a/external/cddl/osnet/sys/sys/zfs_context.h Wed Jan 02 15:50:34 2013 +0000
+++ b/external/cddl/osnet/sys/sys/zfs_context.h Wed Jan 02 16:31:24 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: zfs_context.h,v 1.13 2013/01/02 10:33:19 dsl Exp $     */
+/*     $NetBSD: zfs_context.h,v 1.14 2013/01/02 16:31:24 dsl Exp $     */
 
 /*
  * CDDL HEADER START
@@ -212,11 +212,13 @@
        
 extern kthread_t *zk_thread_create(void (*func)(), void *arg);
 
-/* In NetBSD struct proc is visible in userspace therefore we use it's original
+/* In NetBSD struct proc may be visible in userspace therefore we use it's original
    definition. */
-/* struct proc {
+#if !defined(p_startzero)
+struct proc {
        uintptr_t   this_is_never_used_dont_dereference_it;
-       }; */
+       };
+#endif
 
 extern struct proc p0;