diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index cbb7dc1e3142..c28587deda8d 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -822,6 +822,9 @@ void __init setup_arch(char **cmdline_p)
 	 */
 	x86_configure_nx();
 
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)
+		boot_option_idle_override = IDLE_NOMWAIT;
+
 	parse_early_param();
 
 	if (efi_enabled(EFI_BOOT))