OS-7125 Need mitigation of L1TF (CVE-2018-3646)
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

*** 21,30 ****
--- 21,32 ----
  /*
   * Copyright 2007 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   *
   * Copyright 2013 Nexenta Systems, Inc.  All rights reserved.
+  *
+  * Copyright 2018 Joyent, Inc.
   */
  
  /*      Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
  /*        All Rights Reserved   */
  
*** 149,160 ****
  extern void             dq_sruninc(kthread_t *);
  extern void             dq_srundec(kthread_t *);
  extern void             cpu_rechoose(kthread_t *);
  extern void             cpu_surrender(kthread_t *);
  extern void             kpreempt(int);
! extern struct cpu       *disp_lowpri_cpu(struct cpu *, struct lgrp_ld *, pri_t,
!                             struct cpu *);
  extern int              disp_bound_threads(struct cpu *, int);
  extern int              disp_bound_anythreads(struct cpu *, int);
  extern int              disp_bound_partition(struct cpu *, int);
  extern void             disp_cpu_init(struct cpu *);
  extern void             disp_cpu_fini(struct cpu *);
--- 151,161 ----
  extern void             dq_sruninc(kthread_t *);
  extern void             dq_srundec(kthread_t *);
  extern void             cpu_rechoose(kthread_t *);
  extern void             cpu_surrender(kthread_t *);
  extern void             kpreempt(int);
! extern struct cpu       *disp_lowpri_cpu(struct cpu *, kthread_t *, pri_t);
  extern int              disp_bound_threads(struct cpu *, int);
  extern int              disp_bound_anythreads(struct cpu *, int);
  extern int              disp_bound_partition(struct cpu *, int);
  extern void             disp_cpu_init(struct cpu *);
  extern void             disp_cpu_fini(struct cpu *);
*** 165,174 ****
--- 166,177 ----
  extern void             resume_from_zombie(kthread_t *)
                                  __NORETURN;
  extern void             disp_swapped_enq(kthread_t *);
  extern int              disp_anywork(void);
  
+ extern struct cpu       *disp_choose_best_cpu(void);
+ 
  #define KPREEMPT_SYNC           (-1)
  #define kpreempt_disable()                              \
          {                                               \
                  curthread->t_preempt++;                 \
                  ASSERT(curthread->t_preempt >= 1);      \
*** 181,190 ****
--- 184,195 ----
                          kpreempt(KPREEMPT_SYNC);        \
          }
  
  #endif  /* _KERNEL */
  
+ #define CPU_IDLE_PRI (-1)
+ 
  #ifdef  __cplusplus
  }
  #endif
  
  #endif  /* _SYS_DISP_H */