[patch -mm 15/28] i386: remove volatile in apic.c

Thomas Gleixner
2007-06-23T13:27:00Z

[-- Attachment #1: i386-apic-remove-bogus-volatile.patch --]
[-- Type: text/plain, Size: 1184 bytes --]

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>

---
arch/i386/kernel/apic.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Index: linux-2.6.22-rc4-mm/arch/i386/kernel/apic.c
===================================================================
--- linux-2.6.22-rc4-mm.orig/arch/i386/kernel/apic.c 2007-06-23 14:38:58.000000000 +0200
+++ linux-2.6.22-rc4-mm/arch/i386/kernel/apic.c 2007-06-23 14:38:59.000000000 +0200
@@ -318,7 +318,7 @@ static void __devinit setup_APIC_timer(v

#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();

--