*** 18,27 ****
--- 18,28 ----
   *
   * CDDL HEADER END
   */
  
  /*
+  * Copyright 2015 Joyent, Inc.
   * Copyright 2015 Nexenta Systems, Inc.  All rights reserved.
   * Copyright 2023 Oxide Computer Company
   *
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
*** 87,102 ****
          mcontext_t      uc_mcontext;
          /*
           * The first three entries have been borrowed by the lx brand right now.
           * That should be consolidated into a single uc_brand entry with a
           * UC_BRAND flag. Until such time, we leave them as is.
           */
!         long            uc_filler[3];
          long            uc_xsave;
          long            uc_filler1;
  };
- 
  #if defined(_SYSCALL32)
  
  /* Kernel view of user ILP32 ucontext structure */
  
  typedef struct ucontext32 {
--- 88,104 ----
          mcontext_t      uc_mcontext;
          /*
           * The first three entries have been borrowed by the lx brand right now.
           * That should be consolidated into a single uc_brand entry with a
           * UC_BRAND flag. Until such time, we leave them as is.
+          *
+          * We rename those first three entries here for SmartOS.
           */
!         void            *uc_brand_data[3];
          long            uc_xsave;
          long            uc_filler1;
  };
  #if defined(_SYSCALL32)
  
  /* Kernel view of user ILP32 ucontext structure */
  
  typedef struct ucontext32 {
*** 103,113 ****
          uint32_t        uc_flags;
          caddr32_t       uc_link;
          sigset_t        uc_sigmask;
          stack32_t       uc_stack;
          mcontext32_t    uc_mcontext;
!         int32_t         uc_filler[3];
          int32_t         uc_xsave;
          int32_t         uc_filler1;
  } ucontext32_t;
  
  #if defined(_KERNEL)
--- 105,115 ----
          uint32_t        uc_flags;
          caddr32_t       uc_link;
          sigset_t        uc_sigmask;
          stack32_t       uc_stack;
          mcontext32_t    uc_mcontext;
!         caddr32_t       uc_brand_data[3];
          int32_t         uc_xsave;
          int32_t         uc_filler1;
  } ucontext32_t;
  
  #if defined(_KERNEL)