1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 98a13db5f4be..209ac1e7d1f0 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -97,6 +97,7 @@ static void early_init_intel(struct cpuinfo_x86 *c)
                switch (c->x86_model) {
                case 0x27:      /* Penwell */
                case 0x35:      /* Cloverview */
+                case 0x4a:      /* Merrifield */
                        set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
                        break;
                default:

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 98a13db5f4be..209ac1e7d1f0 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c
@@ -97,6 +97,7 @@ static void early_init_intel(struct cpuinfo_x86 *c)
97	switch (c->x86_model) {	97	switch (c->x86_model) {
98	case 0x27: /* Penwell */	98	case 0x27: /* Penwell */
99	case 0x35: /* Cloverview */	99	case 0x35: /* Cloverview */
		100	case 0x4a: /* Merrifield */
100	set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);	101	set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
101	break;	102	break;
102	default:	103	default: