Add pstate throttling to cpu scaling detection.

-ck

---
 drivers/cpufreq/intel_pstate.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Index: linux-3.15.4-bfs/drivers/cpufreq/intel_pstate.c
===================================================================
--- linux-3.15.4-bfs.orig/drivers/cpufreq/intel_pstate.c	2014-07-09 21:59:19.959620576 +0300
+++ linux-3.15.4-bfs/drivers/cpufreq/intel_pstate.c	2014-07-09 21:59:41.352618975 +0300
@@ -398,8 +398,13 @@
 	vid_fp = clamp_t(int32_t, vid_fp, cpudata->vid.min, cpudata->vid.max);
 	vid = fp_toint(vid_fp);
 
-	if (pstate > cpudata->pstate.max_pstate)
-		vid = cpudata->vid.turbo;
+	if (pstate < cpudata->pstate.max_pstate)
+		cpu_scaling(cpudata->cpu);
+	else {
+		if (pstate > cpudata->pstate.max_pstate)
+			vid = cpudata->vid.turbo;
+		cpu_nonscaling(cpudata->cpu);
+	}
 
 	val |= vid;