OS-5192 need faster clock_gettime
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Joshua M. Clulow <jmc@joyent.com>
Reviewed by: Ryan Zezeski <ryan@zinascii.com>
OS-2834 ship lx brand

*** 1,10 ****
  /*
   * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
   */
  /*
!  * Copyright 2011 Joyent, Inc. All rights reserved.
   */
  
  #ifndef _SYS_SEGMENTS_H
  #define _SYS_SEGMENTS_H
  
--- 1,10 ----
  /*
   * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
   */
  /*
!  * Copyright 2016 Joyent, Inc.
   */
  
  #ifndef _SYS_SEGMENTS_H
  #define _SYS_SEGMENTS_H
  
*** 520,539 ****
  #define GDT_B32CODE     2       /* dboot 32 bit code descriptor */
  #define GDT_B16CODE     3       /* bios call 16 bit code descriptor */
  #define GDT_B16DATA     4       /* bios call 16 bit data descriptor */
  #define GDT_B64CODE     5       /* dboot 64 bit code descriptor */
  #define GDT_BGSTMP      7       /* kmdb descriptor only used early in boot */
  
  #if defined(__amd64)
  
  #define GDT_KCODE       6       /* kernel code seg %cs */
  #define GDT_KDATA       7       /* kernel data seg %ds */
  #define GDT_U32CODE     8       /* 32-bit process on 64-bit kernel %cs */
  #define GDT_UDATA       9       /* user data seg %ds (32 and 64 bit) */
  #define GDT_UCODE       10      /* native user code  seg %cs */
! #define GDT_LDT         12      /* LDT for current process */
! #define GDT_KTSS        14      /* kernel tss */
  #define GDT_FS          GDT_NULL /* kernel %fs segment selector */
  #define GDT_GS          GDT_NULL /* kernel %gs segment selector */
  #define GDT_LWPFS       55      /* lwp private %fs segment selector (32-bit) */
  #define GDT_LWPGS       56      /* lwp private %gs segment selector (32-bit) */
  #define GDT_BRANDMIN    57      /* first entry in GDT for brand usage */
--- 520,540 ----
  #define GDT_B32CODE     2       /* dboot 32 bit code descriptor */
  #define GDT_B16CODE     3       /* bios call 16 bit code descriptor */
  #define GDT_B16DATA     4       /* bios call 16 bit data descriptor */
  #define GDT_B64CODE     5       /* dboot 64 bit code descriptor */
  #define GDT_BGSTMP      7       /* kmdb descriptor only used early in boot */
+ #define GDT_CPUID       16      /* store numeric id of current CPU */
  
  #if defined(__amd64)
  
  #define GDT_KCODE       6       /* kernel code seg %cs */
  #define GDT_KDATA       7       /* kernel data seg %ds */
  #define GDT_U32CODE     8       /* 32-bit process on 64-bit kernel %cs */
  #define GDT_UDATA       9       /* user data seg %ds (32 and 64 bit) */
  #define GDT_UCODE       10      /* native user code  seg %cs */
! #define GDT_LDT         12      /* (12-13) LDT for current process */
! #define GDT_KTSS        14      /* (14-15) kernel tss */
  #define GDT_FS          GDT_NULL /* kernel %fs segment selector */
  #define GDT_GS          GDT_NULL /* kernel %gs segment selector */
  #define GDT_LWPFS       55      /* lwp private %fs segment selector (32-bit) */
  #define GDT_LWPGS       56      /* lwp private %gs segment selector (32-bit) */
  #define GDT_BRANDMIN    57      /* first entry in GDT for brand usage */
*** 681,690 ****
--- 682,693 ----
  extern void overrun(), resvtrap();
  extern void _start(), cmnint();
  extern void achktrap(), mcetrap();
  extern void xmtrap();
  extern void fasttrap();
+ extern void sys_int80();
+ extern void brand_sys_int80();
  extern void dtrace_ret();
  
  #if !defined(__amd64)
  extern void pentium_pftrap();
  #endif