Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: set_cyc2ns_scale() remove prev scale

Browse Source 
Peter Zijlstra pointed out that it's unused.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar 2008-03-31 14:52:15 +02:00
parent b447a468fc
commit 1725037f72
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/tsc_32.c
View File

@ -84,8 +84,8 @@ DEFINE_PER_CPU(unsigned long, cyc2ns);
static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu) static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
{ {
unsigned long flags, prev_scale, *scale;
unsigned long long tsc_now, ns_now; unsigned long long tsc_now, ns_now;
unsigned long flags, *scale;
local_irq_save(flags); local_irq_save(flags);
sched_clock_idle_sleep_event(); sched_clock_idle_sleep_event();
@ -95,7 +95,6 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
rdtscll(tsc_now); rdtscll(tsc_now);
ns_now = __cycles_2_ns(tsc_now); ns_now = __cycles_2_ns(tsc_now);
prev_scale = *scale;
if (cpu_khz) if (cpu_khz)
*scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz; *scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz;

3
arch/x86/kernel/tsc_64.c
View File

@ -44,8 +44,8 @@ DEFINE_PER_CPU(unsigned long, cyc2ns);
static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu) static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
{ {
unsigned long flags, prev_scale, *scale;
unsigned long long tsc_now, ns_now; unsigned long long tsc_now, ns_now;
unsigned long flags, *scale;
local_irq_save(flags); local_irq_save(flags);
sched_clock_idle_sleep_event(); sched_clock_idle_sleep_event();
@ -55,7 +55,6 @@ static void set_cyc2ns_scale(unsigned long cpu_khz, int cpu)
rdtscll(tsc_now); rdtscll(tsc_now);
ns_now = __cycles_2_ns(tsc_now); ns_now = __cycles_2_ns(tsc_now);
prev_scale = *scale;
if (cpu_khz) if (cpu_khz)
*scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz; *scale = (NSEC_PER_MSEC << CYC2NS_SCALE_FACTOR)/cpu_khz;