lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86_64: Fix formatting in time.c

Browse Source 
Only white space changes, code should be identical

Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Andi Kleen
2006-03-25 16:30:34 +01:00
committed by Linus Torvalds
parent 6954bee829
commit 7351c0bfe8
1 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
arch/x86_64/kernel/time.c
View File

@@ -88,7 +88,8 @@ static inline unsigned int do_gettimeoffset_tsc(void)
unsigned long t; unsigned long t;
unsigned long x; unsigned long x;
t = get_cycles_sync(); t = get_cycles_sync();
if (t < vxtime.last_tsc) t = vxtime.last_tsc; /* hack */ if (t < vxtime.last_tsc)
t = vxtime.last_tsc; /* hack */
x = ((t - vxtime.last_tsc) * vxtime.tsc_quot) >> 32; x = ((t - vxtime.last_tsc) * vxtime.tsc_quot) >> 32;
return x; return x;
} }
@@ -178,8 +179,9 @@ unsigned long profile_pc(struct pt_regs *regs)
{ {
unsigned long pc = instruction_pointer(regs); unsigned long pc = instruction_pointer(regs);
/* Assume the lock function has either no stack frame or only a single word. /* Assume the lock function has either no stack frame or only a single
This checks if the address on the stack looks like a kernel text address. word. This checks if the address on the stack looks like a kernel
text address.
There is a small window for false hits, but in that case the tick There is a small window for false hits, but in that case the tick
is just accounted to the spinlock function. is just accounted to the spinlock function.
Better would be to write these functions in assembler again Better would be to write these functions in assembler again
@@ -293,8 +295,7 @@ unsigned long long monotonic_clock(void)
this_offset = hpet_readl(HPET_COUNTER); this_offset = hpet_readl(HPET_COUNTER);
} while (read_seqretry(&xtime_lock, seq)); } while (read_seqretry(&xtime_lock, seq));
offset = (this_offset - last_offset); offset = (this_offset - last_offset);
offset *=(NSEC_PER_SEC/HZ)/hpet_tick; offset *= (NSEC_PER_SEC/HZ) / hpet_tick;
return base + offset;
} else { } else {
do { do {
seq = read_seqbegin(&xtime_lock); seq = read_seqbegin(&xtime_lock);
@@ -303,50 +304,46 @@ unsigned long long monotonic_clock(void)
base = monotonic_base; base = monotonic_base;
} while (read_seqretry(&xtime_lock, seq)); } while (read_seqretry(&xtime_lock, seq));
this_offset = get_cycles_sync(); this_offset = get_cycles_sync();
offset = (this_offset - last_offset)*1000/cpu_khz; offset = (this_offset - last_offset)*1000 / cpu_khz;
return base + offset;
} }
return base + offset;
} }
EXPORT_SYMBOL(monotonic_clock); EXPORT_SYMBOL(monotonic_clock);
static noinline void handle_lost_ticks(int lost, struct pt_regs *regs) static noinline void handle_lost_ticks(int lost, struct pt_regs *regs)
{ {
static long lost_count; static long lost_count;
static int warned; static int warned;
if (report_lost_ticks) {
printk(KERN_WARNING "time.c: Lost %d timer tick(s)! ", lost);
print_symbol("rip %s)\n", regs->rip);
}
if (report_lost_ticks) { if (lost_count == 1000 && !warned) {
printk(KERN_WARNING "time.c: Lost %d timer " printk(KERN_WARNING "warning: many lost ticks.\n"
"tick(s)! ", lost); KERN_WARNING "Your time source seems to be instable or "
print_symbol("rip %s)\n", regs->rip);
}
if (lost_count == 1000 && !warned) {
printk(KERN_WARNING
"warning: many lost ticks.\n"
KERN_WARNING "Your time source seems to be instable or "
"some driver is hogging interupts\n"); "some driver is hogging interupts\n");
print_symbol("rip %s\n", regs->rip); print_symbol("rip %s\n", regs->rip);
if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) { if (vxtime.mode == VXTIME_TSC && vxtime.hpet_address) {
printk(KERN_WARNING "Falling back to HPET\n"); printk(KERN_WARNING "Falling back to HPET\n");
if (hpet_use_timer) if (hpet_use_timer)
vxtime.last = hpet_readl(HPET_T0_CMP) - hpet_tick; vxtime.last = hpet_readl(HPET_T0_CMP) -
else hpet_tick;
vxtime.last = hpet_readl(HPET_COUNTER); else
vxtime.mode = VXTIME_HPET; vxtime.last = hpet_readl(HPET_COUNTER);
do_gettimeoffset = do_gettimeoffset_hpet; vxtime.mode = VXTIME_HPET;
} do_gettimeoffset = do_gettimeoffset_hpet;
/* else should fall back to PIT, but code missing. */ }
warned = 1; /* else should fall back to PIT, but code missing. */
} else warned = 1;
lost_count++; } else
lost_count++;
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
/* In some cases the CPU can change frequency without us noticing /* In some cases the CPU can change frequency without us noticing
(like going into thermal throttle) Give cpufreq a change to catch up. */
Give cpufreq a change to catch up. */ if ((lost_count+1) % 25 == 0)
if ((lost_count+1) % 25 == 0) { cpufreq_delayed_get();
cpufreq_delayed_get();
}
#endif #endif
} }
@@ -556,7 +553,7 @@ static unsigned long get_cmos_time(void)
/* /*
* We know that x86-64 always uses BCD format, no need to check the * We know that x86-64 always uses BCD format, no need to check the
* config register. * config register.
*/ */
BCD_TO_BIN(sec); BCD_TO_BIN(sec);
BCD_TO_BIN(min); BCD_TO_BIN(min);
@@ -618,7 +615,8 @@ static void cpufreq_delayed_get(void)
cpufreq_delayed_issched = 1; cpufreq_delayed_issched = 1;
if (!warned) { if (!warned) {
warned = 1; warned = 1;
printk(KERN_DEBUG "Losing some ticks... checking if CPU frequency changed.\n"); printk(KERN_DEBUG
"Losing some ticks... checking if CPU frequency changed.\n");
} }
schedule_work(&cpufreq_delayed_get_work); schedule_work(&cpufreq_delayed_get_work);
} }
@@ -641,9 +639,9 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
lpj = &dummy; lpj = &dummy;
if (!(freq->flags & CPUFREQ_CONST_LOOPS)) if (!(freq->flags & CPUFREQ_CONST_LOOPS))
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
lpj = &cpu_data[freq->cpu].loops_per_jiffy; lpj = &cpu_data[freq->cpu].loops_per_jiffy;
#else #else
lpj = &boot_cpu_data.loops_per_jiffy; lpj = &boot_cpu_data.loops_per_jiffy;
#endif #endif
if (!ref_freq) { if (!ref_freq) {
@@ -780,9 +778,8 @@ static __init int late_hpet_init(void)
int i; int i;
hpet = (struct hpet *) fix_to_virt(FIX_HPET_BASE); hpet = (struct hpet *) fix_to_virt(FIX_HPET_BASE);
timer = &hpet->hpet_timers[2];
for (i = 2, timer = &hpet->hpet_timers[2]; i < ntimer; for (i = 2; i < ntimer; timer++, i++)
timer++, i++)
hd.hd_irq[i] = (timer->hpet_config & hd.hd_irq[i] = (timer->hpet_config &
Tn_INT_ROUTE_CNF_MASK) >> Tn_INT_ROUTE_CNF_MASK) >>
Tn_INT_ROUTE_CNF_SHIFT; Tn_INT_ROUTE_CNF_SHIFT;
@@ -939,8 +936,7 @@ void __init time_init(void)
-xtime.tv_sec, -xtime.tv_nsec); -xtime.tv_sec, -xtime.tv_nsec);
if (!hpet_init()) if (!hpet_init())
vxtime_hz = (1000000000000000L + hpet_period / 2) / vxtime_hz = (1000000000000000L + hpet_period / 2) / hpet_period;
hpet_period;
else else
vxtime.hpet_address = 0; vxtime.hpet_address = 0;