9936 atomic ops in syscall_mstate() induce significant overhead
9942 zone secflags are not initialized correctly

*** 19,29 ****
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright 2014, Joyent, Inc. All rights reserved.
  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
  # Copyright 2013 Saso Kiselkov. All rights reserved.
  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  # Copyright 2017 Nexenta Systems, Inc.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
--- 19,29 ----
  # CDDL HEADER END
  #
  
  #
  # Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
! # Copyright (c) 2018, Joyent, Inc.
  # Copyright 2013 Garrett D'Amore <garrett@damore.org>
  # Copyright 2013 Saso Kiselkov. All rights reserved.
  # Copyright 2015 Igor Kozhukhov <ikozhukhov@gmail.com>
  # Copyright 2017 Nexenta Systems, Inc.
  # Copyright 2016 Hans Rosenfeld <rosenfeld@grumpf.hope-2000.org>
*** 136,145 ****
--- 136,146 ----
          core.h                  \
          corectl.h               \
          cpc_impl.h              \
          cpc_pcbe.h              \
          cpr.h                   \
+         cpu_uarray.h            \
          cpupart.h               \
          cpuvar.h                \
          crc32.h                 \
          cred.h                  \
          cred_impl.h             \