Module Name: src
Committed By: dsl
Date: Wed Jan 2 16:31:25 UTC 2013
Modified Files:
src/external/cddl/osnet/lib/libzpool: kernel.c
src/external/cddl/osnet/sys/sys: zfs_context.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/external/cddl/osnet/lib/libzpool/kernel.c
cvs rdiff -u -r1.13 -r1.14 src/external/cddl/osnet/sys/sys/zfs_context.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/lib/libzpool/kernel.c
diff -u src/external/cddl/osnet/lib/libzpool/kernel.c:1.6 src/external/cddl/osnet/lib/libzpool/kernel.c:1.7
--- src/external/cddl/osnet/lib/libzpool/kernel.c:1.6 Tue Jan 1 19:03:26 2013
+++ src/external/cddl/osnet/lib/libzpool/kernel.c Wed Jan 2 16:31:24 2013
@@ -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 @@ struct utsname utsname = {
};
/* this only exists to have its address taken */
-// struct proc p0;
+struct proc p0;
/*
* =========================================================================
Index: src/external/cddl/osnet/sys/sys/zfs_context.h
diff -u src/external/cddl/osnet/sys/sys/zfs_context.h:1.13 src/external/cddl/osnet/sys/sys/zfs_context.h:1.14
--- src/external/cddl/osnet/sys/sys/zfs_context.h:1.13 Wed Jan 2 10:33:19 2013
+++ src/external/cddl/osnet/sys/sys/zfs_context.h Wed Jan 2 16:31:24 2013
@@ -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 @@ typedef pthread_t kthread_t;
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;
