OS-5462 lxbrand kernel should be lint clean
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
OS-3554 lx brand: node.js test test-fs-append-file.js hangs on 64-bit

*** 21,31 ****
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
! #pragma ident   "%Z%%M% %I%     %E% SMI"
  
  #include <sys/brand.h>
  #include <sys/systm.h>
  #include <sys/types.h>
  #include <sys/zone.h>
--- 21,33 ----
  /*
   * Copyright 2006 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   */
  
! /*
!  * Copyright 2016 Joyent, Inc.
!  */
  
  #include <sys/brand.h>
  #include <sys/systm.h>
  #include <sys/types.h>
  #include <sys/zone.h>
*** 33,43 ****
  /*
   * brand(2) system call.
   */
  int64_t
  brandsys(int cmd, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3,
!     uintptr_t arg4, uintptr_t arg5, uintptr_t arg6)
  {
          struct proc *p = curthread->t_procp;
          int64_t rval = 0;
          int err;
  
--- 35,45 ----
  /*
   * brand(2) system call.
   */
  int64_t
  brandsys(int cmd, uintptr_t arg1, uintptr_t arg2, uintptr_t arg3,
!     uintptr_t arg4)
  {
          struct proc *p = curthread->t_procp;
          int64_t rval = 0;
          int err;
  
*** 47,56 ****
           */
          if (INGLOBALZONE(p) || !ZONE_IS_BRANDED(p->p_zone))
                  return (set_errno(ENOSYS));
  
          if ((err = ZBROP(p->p_zone)->b_brandsys(cmd, &rval, arg1, arg2, arg3,
!             arg4, arg5, arg6)) != 0)
                  return (set_errno(err));
  
          return (rval);
  }
--- 49,58 ----
           */
          if (INGLOBALZONE(p) || !ZONE_IS_BRANDED(p->p_zone))
                  return (set_errno(ENOSYS));
  
          if ((err = ZBROP(p->p_zone)->b_brandsys(cmd, &rval, arg1, arg2, arg3,
!             arg4)) != 0)
                  return (set_errno(err));
  
          return (rval);
  }