diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-17 16:12:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-04-17 16:12:43 -0700 |
| commit | ebe80544338a393e94b65995120c3028c80abc62 (patch) | |
| tree | 401a4ee423feba3da5fc6cabaadd815a0ab9aace /drivers | |
| parent | 1ce6ec91a8528f80442eee7157be1b016248a883 (diff) | |
| parent | 149c2319c6316d979de90ce2c8665e9c02d5927b (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
Pull idle patches from Len Brown:
"A pair of small patches for 3.9-rc7.
This CPU-id should have been included in the ones that we updated
earlier in 3.9. This pair of patches will allow this flavor of
Haswell to behave like the other flavors."
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
tools/power turbostat: additional Haswell CPU-id
intel_idle: additional Haswell CPU-id
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/idle/intel_idle.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 5d667501386..1a38dd7dfe4 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -465,6 +465,7 @@ static const struct x86_cpu_id intel_idle_ids[] = { ICPU(0x3c, idle_cpu_hsw), ICPU(0x3f, idle_cpu_hsw), ICPU(0x45, idle_cpu_hsw), + ICPU(0x46, idle_cpu_hsw), {} }; MODULE_DEVICE_TABLE(x86cpu, intel_idle_ids); |