diff options
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 4 | 
1 files changed, 3 insertions, 1 deletions
| diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index f02ecaf97904..5369d7fac797 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -676,6 +676,7 @@ static void __init smp_quirk_init_udelay(void)  	/* if modern processor, use no delay */  	if (((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) && (boot_cpu_data.x86 == 6)) || +	    ((boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) && (boot_cpu_data.x86 >= 0x18)) ||  	    ((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) && (boot_cpu_data.x86 >= 0xF))) {  		init_udelay = 0;  		return; @@ -1592,7 +1593,8 @@ static inline void mwait_play_dead(void)  	void *mwait_ptr;  	int i; -	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) +	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || +	    boot_cpu_data.x86_vendor == X86_VENDOR_HYGON)  		return;  	if (!this_cpu_has(X86_FEATURE_MWAIT))  		return; |