Commit 9dd3c71c authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] Commented out printk causes change in program flow in

From: Zwane Mwaikambo <zwane@linuxpower.ca>

Commented out printk causes change in program flow in cpufreq/p4-clockmod.c
parent bcf9d3da
...@@ -104,18 +104,20 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate) ...@@ -104,18 +104,20 @@ static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)
} }
rdmsr(MSR_IA32_THERM_STATUS, l, h); rdmsr(MSR_IA32_THERM_STATUS, l, h);
#if 0
if (l & 0x01) if (l & 0x01)
// printk(KERN_DEBUG PFX "CPU#%d currently thermal throttled\n", cpu); printk(KERN_DEBUG PFX "CPU#%d currently thermal throttled\n", cpu);
#endif
if (has_N44_O17_errata[cpu] && (newstate == DC_25PT || newstate == DC_DFLT)) if (has_N44_O17_errata[cpu] && (newstate == DC_25PT || newstate == DC_DFLT))
newstate = DC_38PT; newstate = DC_38PT;
rdmsr(MSR_IA32_THERM_CONTROL, l, h); rdmsr(MSR_IA32_THERM_CONTROL, l, h);
if (newstate == DC_DISABLE) { if (newstate == DC_DISABLE) {
// printk(KERN_INFO PFX "CPU#%d disabling modulation\n", cpu); /* printk(KERN_INFO PFX "CPU#%d disabling modulation\n", cpu); */
wrmsr(MSR_IA32_THERM_CONTROL, l & ~(1<<4), h); wrmsr(MSR_IA32_THERM_CONTROL, l & ~(1<<4), h);
} else { } else {
// printk(KERN_INFO PFX "CPU#%d setting duty cycle to %d%%\n", cpu, ((125 * newstate) / 10)); /* printk(KERN_INFO PFX "CPU#%d setting duty cycle to %d%%\n",
cpu, ((125 * newstate) / 10)); */
/* bits 63 - 5 : reserved /* bits 63 - 5 : reserved
* bit 4 : enable/disable * bit 4 : enable/disable
* bits 3-1 : duty cycle * bits 3-1 : duty cycle
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment