diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 4ffd78c..275d3d7 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -722,8 +722,10 @@ static void init_amd(struct cpuinfo_x86 *c)
 	 */
 	clear_cpu_cap(c, 0*32+31);
 
-	if (c->x86 >= 0x10)
+	if (c->x86 >= 0x10) {
 		set_cpu_cap(c, X86_FEATURE_REP_GOOD);
+		set_cpu_cap(c, X86_FEATURE_ERMS);
+	}
 
 	/* get apicid instead of initial apic id from cpuid */
 	c->apicid = hard_smp_processor_id();