svn commit: r349983 - stable/12/sys/x86/x86

[Konstantin Belousov]

Author: kib
Date: Sun Jul 14 05:40:03 2019
New Revision: 349983
URL: https://svnweb.freebsd.org/changeset/base/349983

Log:
  MFC r349913:
  Ensure that mds_handler always points to a valid method.

Modified:
  stable/12/sys/x86/x86/cpu_machdep.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/x86/x86/cpu_machdep.c
==============================================================================
--- stable/12/sys/x86/x86/cpu_machdep.c	Sun Jul 14 05:39:02 2019	(r349982)
+++ stable/12/sys/x86/x86/cpu_machdep.c	Sun Jul 14 05:40:03 2019	(r349983)
@@ -924,7 +924,6 @@ int hw_mds_disable;
  * architectural state except possibly %rflags. Also, it is always
  * called with interrupts disabled.
  */
-void (*mds_handler)(void);
 void mds_handler_void(void);
 void mds_handler_verw(void);
 void mds_handler_ivb(void);
@@ -933,6 +932,7 @@ void mds_handler_skl_sse(void);
 void mds_handler_skl_avx(void);
 void mds_handler_skl_avx512(void);
 void mds_handler_silvermont(void);
+void (*mds_handler)(void) = mds_handler_void;
 
 static int
 sysctl_hw_mds_disable_state_handler(SYSCTL_HANDLER_ARGS)