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

@@ -18,11 +18,11 @@
  *
  * CDDL HEADER END
  */
 /*
  * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
- * Copyright (c) 2017 by Delphix. All rights reserved.
+ * Copyright 2018 Joyent, Inc.
  */
 
 #include <sys/types.h>
 #include <sys/systm.h>
 #include <sys/cmn_err.h>

@@ -568,12 +568,12 @@
                                 ASSERT(t->t_lpl->lpl_ncpu > 0);
 
                                 /* Update CPU last ran on if it was this CPU */
                                 if (t->t_cpu == cp && t->t_cpupart == oldpp &&
                                     t->t_bound_cpu != cp) {
-                                        t->t_cpu = disp_lowpri_cpu(ncp,
-                                            t->t_lpl, t->t_pri, NULL);
+                                        t->t_cpu = disp_lowpri_cpu(ncp, t,
+                                            t->t_pri);
                                 }
                                 t = t->t_forw;
                         } while (t != p->p_tlist);
 
                         /*

@@ -621,12 +621,12 @@
                         ASSERT(t->t_lpl->lpl_ncpu > 0);
 
                         /* Update CPU last ran on if it was this CPU */
                         if (t->t_cpu == cp && t->t_cpupart == oldpp &&
                             t->t_bound_cpu != cp) {
-                                t->t_cpu = disp_lowpri_cpu(ncp, t->t_lpl,
-                                    t->t_pri, NULL);
+                                t->t_cpu = disp_lowpri_cpu(ncp, t,
+                                    t->t_pri);
                         }
 
                         t = t->t_next;
                 } while (t != curthread);