8956 Implement KPTI
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>

*** 19,29 ****
   * CDDL HEADER END
   */
  
  /*
   * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright 2017 Joyent, Inc.
   */
  
  #ifndef _SYS_ARCHSYSTM_H
  #define _SYS_ARCHSYSTM_H
  
--- 19,29 ----
   * CDDL HEADER END
   */
  
  /*
   * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright 2018 Joyent, Inc.
   */
  
  #ifndef _SYS_ARCHSYSTM_H
  #define _SYS_ARCHSYSTM_H
  
*** 78,103 ****
  extern void int18(void);
  extern void int20(void);
  extern void int_cmci(void);
  
  #if defined(__amd64)
! extern void sys_syscall();
! extern void sys_syscall32();
  extern void sys_lcall32();
  extern void sys_syscall_int();
! extern void brand_sys_syscall();
! extern void brand_sys_syscall32();
! extern void brand_sys_syscall_int();
  extern int update_sregs();
  extern void reset_sregs();
  #elif defined(__i386)
  extern void sys_call();
  extern void brand_sys_call();
  #endif
  extern void sys_sysenter();
  extern void _sys_sysenter_post_swapgs();
  extern void brand_sys_sysenter();
  extern void _brand_sys_sysenter_post_swapgs();
  
  extern void dosyscall(void);
  
  extern void bind_hwcap(void);
--- 78,107 ----
  extern void int18(void);
  extern void int20(void);
  extern void int_cmci(void);
  
  #if defined(__amd64)
! extern void sys_syscall(), tr_sys_syscall();
! extern void sys_syscall32(), tr_sys_syscall32();
  extern void sys_lcall32();
  extern void sys_syscall_int();
! extern void tr_sys_syscall_int();
! extern void brand_sys_syscall(), tr_brand_sys_syscall();
! extern void brand_sys_syscall32(), tr_brand_sys_syscall32();
! extern void brand_sys_syscall_int(), tr_brand_sys_syscall_int();
  extern int update_sregs();
  extern void reset_sregs();
  #elif defined(__i386)
  extern void sys_call();
+ extern void tr_sys_call();
  extern void brand_sys_call();
  #endif
  extern void sys_sysenter();
+ extern void tr_sys_sysenter();
  extern void _sys_sysenter_post_swapgs();
  extern void brand_sys_sysenter();
+ extern void tr_brand_sys_sysenter();
  extern void _brand_sys_sysenter_post_swapgs();
  
  extern void dosyscall(void);
  
  extern void bind_hwcap(void);