diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2007-07-21 17:11:32 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 18:37:14 -0700 |
| commit | f5352fd0ce41b079a01e23c01ea3578c29f097e7 (patch) | |
| tree | 8452b1cb618b5e84a41eea265086107b29886e01 | |
| parent | f2cf8e085c0d3fd5c755d7c0de7334a50ebb728e (diff) | |
| download | op-kernel-dev-f5352fd0ce41b079a01e23c01ea3578c29f097e7.zip op-kernel-dev-f5352fd0ce41b079a01e23c01ea3578c29f097e7.tar.gz | |
i386: remove volatile in apic.c
Remove the volatile in apic. We have a cpu_relax() in the wait loop. Fix a
coding style issue while at it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | arch/i386/kernel/apic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/apic.c b/arch/i386/kernel/apic.c index 83988c3..bfc6cb7 100644 --- a/arch/i386/kernel/apic.c +++ b/arch/i386/kernel/apic.c @@ -318,7 +318,7 @@ static void __devinit setup_APIC_timer(void) #define LAPIC_CAL_LOOPS (HZ/10) -static __initdata volatile int lapic_cal_loops = -1; +static __initdata int lapic_cal_loops = -1; static __initdata long lapic_cal_t1, lapic_cal_t2; static __initdata unsigned long long lapic_cal_tsc1, lapic_cal_tsc2; static __initdata unsigned long lapic_cal_pm1, lapic_cal_pm2; @@ -488,7 +488,7 @@ void __init setup_boot_APIC_clock(void) /* Let the interrupts run */ local_irq_enable(); - while(lapic_cal_loops <= LAPIC_CAL_LOOPS) + while (lapic_cal_loops <= LAPIC_CAL_LOOPS) cpu_relax(); local_irq_disable(); |
