@@ -22,14 +22,10 @@
 /*
  * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
-/*
- * Copyright (c) 2015, Joyent, Inc.  All rights reserved.
- */
-
 #ifndef _SYS_THREAD_H
 #define _SYS_THREAD_H
 
 
 #include <sys/types.h>

@@ -70,12 +66,10 @@
         void    (*lwp_create_op)(void *, void *);       /* lwp_create context */
         void    (*exit_op)(void *);     /* invoked during {thread,lwp}_exit() */
         void    (*free_op)(void *, int); /* function which frees the context */
         void    *arg;           /* argument to above functions, ctx pointer */
         struct ctxop *next;     /* next context ops */
-        hrtime_t save_ts;               /* timestamp of last save */
-        hrtime_t restore_ts;            /* timestamp of last restore */
 } ctxop_t;
 
 /*
  * The active file descriptor table.
  * Each member of a_fd[] not equalling -1 represents an active fd.

@@ -370,11 +364,11 @@
 #define T_TALLOCSTK     0x0008  /* thread structure allocated from stk */
 #define T_FORKALL       0x0010  /* thread was cloned by forkall() */
 #define T_WOULDBLOCK    0x0020  /* for lockfs */
 #define T_DONTBLOCK     0x0040  /* for lockfs */
 #define T_DONTPEND      0x0080  /* for lockfs */
-#define T_SPLITSTK      0x0100  /* kernel stack is currently split */
+#define T_SYS_PROF      0x0100  /* profiling on for duration of system call */
 #define T_WAITCVSEM     0x0200  /* waiting for a lwp_cv or lwp_sema on sleepq */
 #define T_WATCHPT       0x0400  /* thread undergoing a watchpoint emulation */
 #define T_PANIC         0x0800  /* thread initiated a system panic */
 #define T_LWPREUSE      0x1000  /* stack and LWP can be reused */
 #define T_CAPTURING     0x2000  /* thread is in page capture logic */

@@ -599,11 +593,10 @@
 extern disp_lock_t stop_lock;           /* lock protecting stopped threads */
 
 caddr_t thread_stk_init(caddr_t);       /* init thread stack */
 
 extern int default_binding_mode;
-extern int default_stksize;
 
 #endif  /* _KERNEL */
 
 /*
  * Macros to indicate that the thread holds resources that could be critical