Commit f5352fd0 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Linus Torvalds

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: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2cf8e08
...@@ -318,7 +318,7 @@ static void __devinit setup_APIC_timer(void) ...@@ -318,7 +318,7 @@ static void __devinit setup_APIC_timer(void)
#define LAPIC_CAL_LOOPS (HZ/10) #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 long lapic_cal_t1, lapic_cal_t2;
static __initdata unsigned long long lapic_cal_tsc1, lapic_cal_tsc2; static __initdata unsigned long long lapic_cal_tsc1, lapic_cal_tsc2;
static __initdata unsigned long lapic_cal_pm1, lapic_cal_pm2; static __initdata unsigned long lapic_cal_pm1, lapic_cal_pm2;
...@@ -488,7 +488,7 @@ void __init setup_boot_APIC_clock(void) ...@@ -488,7 +488,7 @@ void __init setup_boot_APIC_clock(void)
/* Let the interrupts run */ /* Let the interrupts run */
local_irq_enable(); local_irq_enable();
while(lapic_cal_loops <= LAPIC_CAL_LOOPS) while (lapic_cal_loops <= LAPIC_CAL_LOOPS)
cpu_relax(); cpu_relax();
local_irq_disable(); local_irq_disable();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment