Merge tag 'v4.9.220' into 4.9-2.3.x-imx

This is the 4.9.220 stable release

Conflicts:
	arch/arm/Kconfig.debug
	arch/arm/boot/dts/imx7s.dtsi
	arch/arm/mach-imx/common.h
	arch/arm/mach-imx/cpuidle-imx6q.c
	arch/arm/mach-imx/cpuidle-imx6sx.c
	arch/arm/mach-imx/suspend-imx6.S
	block/blk-core.c
	drivers/crypto/caam/caamalg.c
	drivers/crypto/mxs-dcp.c
	drivers/dma/imx-sdma.c
	drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
	drivers/input/keyboard/imx_keypad.c
	drivers/input/keyboard/snvs_pwrkey.c
	drivers/mmc/host/sdhci.c
	drivers/net/can/flexcan.c
	drivers/net/ethernet/freescale/fec_main.c
	drivers/net/phy/phy_device.c
	drivers/net/wireless/ath/ath10k/pci.c
	drivers/tty/serial/imx.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/xhci.c
	include/linux/blkdev.h
	include/linux/cpu.h
	include/linux/platform_data/dma-imx-sdma.h
	kernel/cpu.c
	net/wireless/util.c
	sound/soc/fsl/Kconfig
	sound/soc/fsl/fsl_esai.c
	sound/soc/fsl/fsl_sai.c
	sound/soc/fsl/imx-sgtl5000.c

1 files changed, 4 insertions, 0 deletions

diff --git a/arch/x86/include/asm/irqflags.h b/arch/x86/include/asm/irqflags.h
index 508a062e6cf1..0c8f4281b151 100644
--- a/arch/x86/include/asm/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
@@ -5,6 +5,8 @@
 
 #ifndef __ASSEMBLY__
 
+#include <asm/nospec-branch.h>
+
 /* Provide __cpuidle; we can't safely include <linux/cpu.h> */
 #define __cpuidle __attribute__((__section__(".cpuidle.text")))
 
@@ -53,11 +55,13 @@ static inline void native_irq_enable(void)
 
 static inline __cpuidle void native_safe_halt(void)
 {
+	mds_idle_clear_cpu_buffers();
 	asm volatile("sti; hlt": : :"memory");
 }
 
 static inline __cpuidle void native_halt(void)
 {
+	mds_idle_clear_cpu_buffers();
 	asm volatile("hlt": : :"memory");
 }