svn commit: r310787 - stable/11/sys/x86/x86

[Mark Johnston]

Author: markj
Date: Thu Dec 29 21:03:00 2016
New Revision: 310787
URL: https://svnweb.freebsd.org/changeset/base/310787

Log:
  MFC r309657:
  Require the STACK option for code that captures stacks of running threads.

Modified:
  stable/11/sys/x86/x86/mca.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/x86/x86/mca.c
==============================================================================
--- stable/11/sys/x86/x86/mca.c	Thu Dec 29 20:28:50 2016	(r310786)
+++ stable/11/sys/x86/x86/mca.c	Thu Dec 29 21:03:00 2016	(r310787)
@@ -508,7 +508,7 @@ mca_record_entry(enum scan_mode mode, co
 	STAILQ_INSERT_TAIL(&mca_records, rec, link);
 	mca_count++;
 	mtx_unlock_spin(&mca_lock);
-	if (mode == CMCI)
+	if (mode == CMCI && !cold)
 		taskqueue_enqueue(mca_tq, &mca_refill_task);
 }
 
@@ -714,6 +714,9 @@ mca_createtq(void *dummy)
 	mca_tq = taskqueue_create_fast("mca", M_WAITOK,
 	    taskqueue_thread_enqueue, &mca_tq);
 	taskqueue_start_threads(&mca_tq, 1, PI_SWI(SWI_TQ), "mca taskq");
+
+	/* CMCIs during boot may have claimed items from the freelist. */
+	mca_fill_freelist();
 }
 SYSINIT(mca_createtq, SI_SUB_CONFIGURE, SI_ORDER_ANY, mca_createtq, NULL);