Re: 2.5.74-mm1 (p4-clockmod does not compile) PATCH

Dumitru Ciobarcianu
2003-07-03T11:18:11Z

[-- Attachment #1: Type: text/plain, Size: 346 bytes --]

On Thu, 2003-07-03 at 14:20, William Lee Irwin III wrote:
> Great! Could you send back the diff? (or alternatively, the file
> contents if you didn't preserve the old contents) so I can send the
> proper diff upstream?

I have attached the patch since evolution seems to really want to break
the patch if I do an "Insert text file" :(

--
Cioby

[-- Attachment #2: p4-clockmod.patch --]
[-- Type: text/plain, Size: 1237 bytes --]

--- /usr/src/linux-2.5.74/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c.original 2003-07-03 14:12:35.000000000 +0300
+++ /usr/src/linux-2.5.74/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2003-07-03 14:28:10.000000000 +0300
@@ -53,10 +53,9 @@
static int cpufreq_p4_setdc(unsigned int cpu, unsigned int newstate)
{
u32 l, h;
- unsigned long cpus_allowed;
+ cpumask_t cpus_allowed, affected_cpu_map;
struct cpufreq_freqs freqs;
int hyperthreading = 0;
- int affected_cpu_map = 0;
int sibling = 0;

if (!cpu_online(cpu) || (newstate > DC_DISABLE) ||
@@ -67,16 +66,16 @@
cpus_allowed = current->cpus_allowed;

/* only run on CPU to be set, or on its sibling */
- affected_cpu_map = 1 << cpu;
+ affected_cpu_map = cpumask_of_cpu(cpu);
#ifdef CONFIG_X86_HT
hyperthreading = ((cpu_has_ht) && (smp_num_siblings == 2));
if (hyperthreading) {
sibling = cpu_sibling_map[cpu];
- affected_cpu_map |= (1 << sibling);
+ cpu_set(sibling, affected_cpu_map);
}
#endif
set_cpus_allowed(current, affected_cpu_map);
- BUG_ON(!(affected_cpu_map & (1 << smp_processor_id())));
+ BUG_ON(!cpu_isset(smp_processor_id(), affected_cpu_map));

/* get current state */
rdmsr(MSR_IA32_THERM_CONTROL, l, h);