diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-05 02:10:38 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-01-05 02:10:38 +0400 |
| commit | 3eef2455f350708269fe42fab07b8c73efca83dc (patch) | |
| tree | 839e3585507d0bcceb8d4bdfff7dad56547fda22 /drivers/idle/intel_idle.c | |
| parent | f3fe8bd7b114d88c802616a98a0cf69299c37ed3 (diff) | |
| parent | ac34d7c8c87c247db0270285950753da045acaad (diff) | |
| download | linux-3eef2455f350708269fe42fab07b8c73efca83dc.tar.xz | |
Merge branch 'pm-cpuidle'
By Sivaram Nair (2) and others
* pm-cpuidle:
cpuidle: fix lock contention in the idle path
intel_idle: pr_debug information need separated
cpuidle / coupled: fix ready counter decrement
cpuidle: Fix finding state with min power_usage
Diffstat (limited to 'drivers/idle/intel_idle.c')
| -rw-r--r-- | drivers/idle/intel_idle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index c49c04d9c2b0..4ba384f1ab54 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c @@ -506,7 +506,7 @@ static int intel_idle_cpuidle_driver_init(void) if (*cpuidle_state_table[cstate].name == '\0') pr_debug(PREFIX "unaware of model 0x%x" " MWAIT %d please" - " contact lenb@kernel.org", + " contact lenb@kernel.org\n", boot_cpu_data.x86_model, cstate); continue; } |