diff options
| author | Mark Brown <broonie@linaro.org> | 2014-08-05 11:46:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-08-05 11:46:14 +0100 |
| commit | 335ab1659bbf3ecf8dc1ba31e66111d35d54e8c9 (patch) | |
| tree | 02ad2c99f5c728cfd9ac8ed132d987a355ddd5c2 /drivers/gator/gator_trace_power.c | |
| parent | 14899ae67197e6e84cecf018f39d1be1a2d75b92 (diff) | |
| parent | ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14 (diff) | |
Merge commit 'ed30f24e8d07d30aa3e69d1f508f4d7bd2e8ea14' of git://git.linaro.org/landing-teams/working/arm/kernel into lsk-v3.10-gator
Diffstat (limited to 'drivers/gator/gator_trace_power.c')
| -rw-r--r-- | drivers/gator/gator_trace_power.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gator/gator_trace_power.c b/drivers/gator/gator_trace_power.c index 1895bb988c9f..f2754b1c2b56 100644 --- a/drivers/gator/gator_trace_power.c +++ b/drivers/gator/gator_trace_power.c @@ -75,7 +75,7 @@ static int gator_trace_power_create_files(struct super_block *sb, struct dentry GATOR_DEFINE_PROBE(cpu_frequency, TP_PROTO(unsigned int frequency, unsigned int cpu)) { cpu = lcpu_to_pcpu(cpu); - marshal_event_single(cpu, power_cpu_key[POWER_CPU_FREQ], frequency * 1000); + marshal_event_single64(cpu, power_cpu_key[POWER_CPU_FREQ], frequency * 1000L); } GATOR_DEFINE_PROBE(cpu_idle, TP_PROTO(unsigned int state, unsigned int cpu)) @@ -109,7 +109,7 @@ static void gator_trace_power_online(void) int pcpu = get_physical_cpu(); int lcpu = get_logical_cpu(); if (power_cpu_enabled[POWER_CPU_FREQ]) { - marshal_event_single(pcpu, power_cpu_key[POWER_CPU_FREQ], cpufreq_quick_get(lcpu) * 1000); + marshal_event_single64(pcpu, power_cpu_key[POWER_CPU_FREQ], cpufreq_quick_get(lcpu) * 1000L); } } |