Merge branch 'master' of /home/aggelos/devel/dfly/dfly.git/

diff --combined sys/kern/kern_exit.c
index ae3c147,5a96ffb..0975726
--- 1/sys/kern/kern_exit.c
--- 2/sys/kern/kern_exit.c
+++ b/sys/kern/kern_exit.c
@@@ -276,8 -276,6 +276,8 @@@ exit1(int rv
                panic("Going nowhere without my init!");
        }
  
 +      varsymset_clean(&p->p_varsymset);
 +      lockuninit(&p->p_varsymset.vx_lock);
        /*
         * Kill all lwps associated with the current process, return an
         * error if we race another thread trying to do the same thing
@@@ -669,7 -667,7 +669,7 @@@ sys_wait4(struct wait_args *uap
        int error, status;
  
        error = kern_wait(uap->pid, uap->status ? &status : NULL,
-           uap->options, uap->rusage ? &rusage : NULL, &uap->sysmsg_fds[0]);
+           uap->options, uap->rusage ? &rusage : NULL, &uap->sysmsg_result);
  
        if (error == 0 && uap->status)
                error = copyout(&status, uap->status, sizeof(*uap->status));

diff --combined sys/sys/varsym.h
index ee5ef61,3fdd1d4..f482fdb
--- 1/sys/sys/varsym.h
--- 2/sys/sys/varsym.h
+++ b/sys/sys/varsym.h
@@@ -16,8 -16,6 +16,8 @@@
  #include <sys/queue.h>                /* TAILQ_* macros */
  #endif
  
 +#include <sys/lock.h>
 +
  struct varsym {
      int               vs_refs;        /* a lot of sharing occurs */
      int               vs_namelen;
@@@ -35,7 -33,6 +35,7 @@@ struct varsyment 
  struct varsymset {
      TAILQ_HEAD(, varsyment) vx_queue;
      int               vx_setsize;
 +    struct lock vx_lock;
  };
  
  #endif        /* _KERNEL || _KERNEL_STRUCTURES */
@@@ -52,7 -49,7 +52,7 @@@
  
  #define MAXVARSYM_NAME        64
  #define MAXVARSYM_DATA        256
- #define MAXVARSYM_SET 8192
+ #define MAXVARSYM_SET 16384
  
  #ifdef _KERNEL