Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 168791
b: refs/heads/master
c: 8dca15e
h: refs/heads/master
i:
  168789: c5ba47f
  168787: d50497f
  168783: 1a313ac
v: v3
  • Loading branch information
Rusty Russell authored and Dave Jones committed Nov 18, 2009
1 parent 530b8fc commit ccb3906
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 13 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e77b89f13a0d48aea70b69976e854f2a2444a519
refs/heads/master: 8dca15e40889e5d5e9655b03ba79c26200f760ce
19 changes: 7 additions & 12 deletions trunk/arch/x86/kernel/cpu/cpufreq/speedstep-ich.c
Original file line number Diff line number Diff line change
Expand Up @@ -232,28 +232,23 @@ static unsigned int speedstep_detect_chipset(void)
return 0;
}

struct get_freq_data {
unsigned int speed;
unsigned int processor;
};

static void get_freq_data(void *_data)
static void get_freq_data(void *_speed)
{
struct get_freq_data *data = _data;
unsigned int *speed = _speed;

data->speed = speedstep_get_frequency(data->processor);
*speed = speedstep_get_frequency(speedstep_processor);
}

static unsigned int speedstep_get(unsigned int cpu)
{
struct get_freq_data data = { .processor = cpu };
unsigned int speed;

/* You're supposed to ensure CPU is online. */
if (smp_call_function_single(cpu, get_freq_data, &data, 1) != 0)
if (smp_call_function_single(cpu, get_freq_data, &speed, 1) != 0)
BUG();

dprintk("detected %u kHz as current frequency\n", data.speed);
return data.speed;
dprintk("detected %u kHz as current frequency\n", speed);
return speed;
}

/**
Expand Down

0 comments on commit ccb3906

Please sign in to comment.