--- old/usr/src/uts/intel/sys/machbrand.h
          +++ new/usr/src/uts/intel/sys/machbrand.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
  23   23   * Copyright 2016 Joyent, Inc.
  24   24   */
  25   25  
  26   26  #ifndef _SYS_MACHBRAND_H
  27   27  #define _SYS_MACHBRAND_H
  28   28  
  29   29  #ifdef  __cplusplus
  30   30  extern "C" {
  31   31  #endif
  32   32  
  33   33  #ifndef _ASM
  34   34  
  35   35  #include <sys/model.h>
  36   36  #include <sys/thread.h>
  37   37  
  38   38  struct brand_mach_ops {
  39   39          void    (*b_sysenter)(void);
  40   40          void    (*b_int80)(void);
  41   41          void    (*b_int91)(void);
  42   42          void    (*b_syscall)(void);
  43   43          void    (*b_syscall32)(void);
  44   44          greg_t  (*b_fixsegreg)(greg_t, model_t);
  45   45          uintptr_t (*b_fsbase)(klwp_t *, uintptr_t);
  46   46  };
  47   47  
  48   48  #endif  /* _ASM */
  49   49  
  50   50  #define BRAND_CB_SYSENTER       0
  51   51  #define BRAND_CB_INT80          1
  52   52  #define BRAND_CB_INT91          2
  53   53  #define BRAND_CB_SYSCALL        3
  54   54  #define BRAND_CB_SYSCALL32      4
  55   55  
  56   56  #ifdef  __cplusplus
  57   57  }
  58   58  #endif
  59   59  
  60   60  #endif  /* _SYS_MACHBRAND_H */

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX