From: Thomas Gleixner <tglx@linutronix.de>
To: LKML <linux-kernel@vger.kernel.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Andi Kleen <ak@suse.de>, Chris Wright <chrisw@sous-sol.org>
Subject: [patch-mm 13/33] x86_64: time.c white space wreckage cleanup
Date: Sun, 15 Jul 2007 16:10:54 -0000 [thread overview]
Message-ID: <20070715155541.235704807@inhelltoy.tec.linutronix.de> (raw)
In-Reply-To: 20070715155510.341941668@inhelltoy.tec.linutronix.de
[-- Attachment #1: x86_64-timec-fix-whitespace-wreckage.patch --]
[-- Type: text/plain, Size: 4473 bytes --]
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86_64/kernel/time.c | 88 +++++++++++++++++++++++-----------------------
1 file changed, 44 insertions(+), 44 deletions(-)
Index: linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c
===================================================================
--- linux-2.6.22-rc6-mm.orig/arch/x86_64/kernel/time.c 2007-07-15 17:30:59.000000000 +0200
+++ linux-2.6.22-rc6-mm/arch/x86_64/kernel/time.c 2007-07-15 17:49:03.000000000 +0200
@@ -222,7 +222,7 @@ unsigned long read_persistent_clock(void
/*
* We know that x86-64 always uses BCD format, no need to check the
* config register.
- */
+ */
BCD_TO_BIN(sec);
BCD_TO_BIN(min);
@@ -235,11 +235,11 @@ unsigned long read_persistent_clock(void
BCD_TO_BIN(century);
year += century * 100;
printk(KERN_INFO "Extended CMOS year: %d\n", century * 100);
- } else {
+ } else {
/*
* x86-64 systems only exists since 2002.
* This will work up to Dec 31, 2100
- */
+ */
year += 2000;
}
@@ -251,45 +251,45 @@ unsigned long read_persistent_clock(void
#define TICK_COUNT 100000000
static unsigned int __init tsc_calibrate_cpu_khz(void)
{
- int tsc_start, tsc_now;
- int i, no_ctr_free;
- unsigned long evntsel3 = 0, pmc3 = 0, pmc_now = 0;
- unsigned long flags;
-
- for (i = 0; i < 4; i++)
- if (avail_to_resrv_perfctr_nmi_bit(i))
- break;
- no_ctr_free = (i == 4);
- if (no_ctr_free) {
- i = 3;
- rdmsrl(MSR_K7_EVNTSEL3, evntsel3);
- wrmsrl(MSR_K7_EVNTSEL3, 0);
- rdmsrl(MSR_K7_PERFCTR3, pmc3);
- } else {
- reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i);
- reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
- }
- local_irq_save(flags);
- /* start meauring cycles, incrementing from 0 */
- wrmsrl(MSR_K7_PERFCTR0 + i, 0);
- wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76);
- rdtscl(tsc_start);
- do {
- rdmsrl(MSR_K7_PERFCTR0 + i, pmc_now);
- tsc_now = get_cycles_sync();
- } while ((tsc_now - tsc_start) < TICK_COUNT);
-
- local_irq_restore(flags);
- if (no_ctr_free) {
- wrmsrl(MSR_K7_EVNTSEL3, 0);
- wrmsrl(MSR_K7_PERFCTR3, pmc3);
- wrmsrl(MSR_K7_EVNTSEL3, evntsel3);
- } else {
- release_perfctr_nmi(MSR_K7_PERFCTR0 + i);
- release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
- }
+ int tsc_start, tsc_now;
+ int i, no_ctr_free;
+ unsigned long evntsel3 = 0, pmc3 = 0, pmc_now = 0;
+ unsigned long flags;
+
+ for (i = 0; i < 4; i++)
+ if (avail_to_resrv_perfctr_nmi_bit(i))
+ break;
+ no_ctr_free = (i == 4);
+ if (no_ctr_free) {
+ i = 3;
+ rdmsrl(MSR_K7_EVNTSEL3, evntsel3);
+ wrmsrl(MSR_K7_EVNTSEL3, 0);
+ rdmsrl(MSR_K7_PERFCTR3, pmc3);
+ } else {
+ reserve_perfctr_nmi(MSR_K7_PERFCTR0 + i);
+ reserve_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
+ }
+ local_irq_save(flags);
+ /* start meauring cycles, incrementing from 0 */
+ wrmsrl(MSR_K7_PERFCTR0 + i, 0);
+ wrmsrl(MSR_K7_EVNTSEL0 + i, 1 << 22 | 3 << 16 | 0x76);
+ rdtscl(tsc_start);
+ do {
+ rdmsrl(MSR_K7_PERFCTR0 + i, pmc_now);
+ tsc_now = get_cycles_sync();
+ } while ((tsc_now - tsc_start) < TICK_COUNT);
+
+ local_irq_restore(flags);
+ if (no_ctr_free) {
+ wrmsrl(MSR_K7_EVNTSEL3, 0);
+ wrmsrl(MSR_K7_PERFCTR3, pmc3);
+ wrmsrl(MSR_K7_EVNTSEL3, evntsel3);
+ } else {
+ release_perfctr_nmi(MSR_K7_PERFCTR0 + i);
+ release_evntsel_nmi(MSR_K7_EVNTSEL0 + i);
+ }
- return pmc_now * tsc_khz / (tsc_now - tsc_start);
+ return pmc_now * tsc_khz / (tsc_now - tsc_start);
}
/*
@@ -317,7 +317,7 @@ static unsigned int __init pit_calibrate
end = get_cycles_sync();
spin_unlock_irqrestore(&i8253_lock, flags);
-
+
return (end - start) / 50;
}
@@ -362,7 +362,7 @@ static struct irqaction irq0 = {
.handler = timer_interrupt,
.flags = IRQF_DISABLED | IRQF_IRQPOLL,
.mask = CPU_MASK_NONE,
- .name = "timer"
+ .name = "timer"
};
void __init time_init(void)
@@ -375,7 +375,7 @@ void __init time_init(void)
if (hpet_use_timer) {
/* set tick_nsec to use the proper rate for HPET */
- tick_nsec = TICK_NSEC_HPET;
+ tick_nsec = TICK_NSEC_HPET;
tsc_khz = hpet_calibrate_tsc();
timename = "HPET";
} else {
--
next prev parent reply other threads:[~2007-07-15 16:10 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-07-15 16:10 [patch-mm 00/33] x86_64 clock events conversion - V5 Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 01/33] clockevents: Remove unused inline function Thomas Gleixner
2007-07-17 12:33 ` Andi Kleen
2007-07-17 14:58 ` Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 02/33] clockevents: Allow build w/o run-tine usage for migration purposes Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 03/33] i386: remove pit_interrupt_hook Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 04/33] X86_64: hpet tsc calibration fix broken smi detection logic Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 05/33] x86_64: Untangle asm/hpet.h from asm/timex.h Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 06/33] x86_64: use generic cmos update Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 07/33] x86_64: Use generic xtime init Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 08/33] x86_64: Remove dead code and other janitor work in tsc.c Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 09/33] x86_64: Fix APIC typo Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 10/33] x86_64: fiuxp pt_reqs leftovers Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 11/33] x86_64: share hpet.h with i386 Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 12/33] x86_64: apic.c coding style janitor work Thomas Gleixner
2007-07-15 16:10 ` Thomas Gleixner [this message]
2007-07-15 16:10 ` [patch-mm 14/33] x86_64: Consolidate tsc calibration Thomas Gleixner
2007-07-17 12:51 ` Andi Kleen
2007-07-17 15:00 ` Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 15/33] i386: prepare sharing the hpet code with x86_64 Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 16/33] i386: hpet add x8664 bits Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 17/33] i386: prepare sharing the PIT code Thomas Gleixner
2007-07-15 16:10 ` [patch-mm 18/33] x86_64: use shared i8253.h Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 19/33] x86_64: prepare apic code for clock events Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 20/33] x86_64: remove pit synchronization Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 21/33] x86_64: Move apic calibration code around Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 22/33] x86_64: Remove APIC_DIVISOR Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 23/33] x86_64: apic change setup_APIC_timer calling convention Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 24/33] x86_64: remove nested irq disables Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 25/33] x86_64: prepare idle loop for dynamic ticks Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 26/33] x86_64: apic add clock event functions Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 27/33] x86_64: convert to clock events Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 28/33] x86_64: remove now unused code Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 29/33] x86_64: cleanup apic.c after clock events switch Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 30/33] jiffies: remove unused macros Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 31/33] ACPI: remove the now unused ifdef code Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 32/33] i386: Remove the useless #ifdef in i8253.h Thomas Gleixner
2007-07-15 16:11 ` [patch-mm 33/33] i386/x8664: cleanup the shared hpet code Thomas Gleixner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070715155541.235704807@inhelltoy.tec.linutronix.de \
--to=tglx@linutronix.de \
--cc=ak@suse.de \
--cc=akpm@linux-foundation.org \
--cc=chrisw@sous-sol.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox