Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / x86 / kernel / cpu / intel.c

diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 1acdd42..a942b7c 100644 (file)
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -96,6 +96,18 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
                        sched_clock_stable = 1;
        }
 
+       /* Penwell and Cloverview have the TSC which doesn't sleep on S3 */
+       if (c->x86 == 6) {
+               switch (c->x86_model) {
+               case 0x27:      /* Penwell */
+               case 0x35:      /* Cloverview */
+                       set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC_S3);
+                       break;
+               default:
+                       break;
+               }
+       }
+
        /*
         * There is a known erratum on Pentium III and Core Solo
         * and Core Duo CPUs.