x86_64: apic.c coding style janitor work
Fix coding style, white space wreckage and remove unused code. 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> Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0655d7c32b
commit
6935d1f922
|
@ -93,7 +93,8 @@ void enable_NMI_through_LVT0 (void * dummy)
|
||||||
{
|
{
|
||||||
unsigned int v;
|
unsigned int v;
|
||||||
|
|
||||||
v = APIC_DM_NMI; /* unmask and set to NMI */
|
/* unmask and set to NMI */
|
||||||
|
v = APIC_DM_NMI;
|
||||||
apic_write(APIC_LVT0, v);
|
apic_write(APIC_LVT0, v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -120,7 +121,7 @@ void ack_bad_irq(unsigned int irq)
|
||||||
* holds up an irq slot - in excessive cases (when multiple
|
* holds up an irq slot - in excessive cases (when multiple
|
||||||
* unexpected vectors occur) that might lock up the APIC
|
* unexpected vectors occur) that might lock up the APIC
|
||||||
* completely.
|
* completely.
|
||||||
* But don't ack when the APIC is disabled. -AK
|
* But don't ack when the APIC is disabled. -AK
|
||||||
*/
|
*/
|
||||||
if (!disable_apic)
|
if (!disable_apic)
|
||||||
ack_APIC_irq();
|
ack_APIC_irq();
|
||||||
|
@ -789,13 +790,13 @@ static void setup_APIC_timer(unsigned int clocks)
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
|
|
||||||
/* wait for irq slice */
|
/* wait for irq slice */
|
||||||
if (hpet_address && hpet_use_timer) {
|
if (hpet_address && hpet_use_timer) {
|
||||||
int trigger = hpet_readl(HPET_T0_CMP);
|
int trigger = hpet_readl(HPET_T0_CMP);
|
||||||
while (hpet_readl(HPET_COUNTER) >= trigger)
|
while (hpet_readl(HPET_COUNTER) >= trigger)
|
||||||
/* do nothing */ ;
|
/* do nothing */ ;
|
||||||
while (hpet_readl(HPET_COUNTER) < trigger)
|
while (hpet_readl(HPET_COUNTER) < trigger)
|
||||||
/* do nothing */ ;
|
/* do nothing */ ;
|
||||||
} else {
|
} else {
|
||||||
int c1, c2;
|
int c1, c2;
|
||||||
outb_p(0x00, 0x43);
|
outb_p(0x00, 0x43);
|
||||||
c2 = inb_p(0x40);
|
c2 = inb_p(0x40);
|
||||||
|
@ -1128,20 +1129,6 @@ asmlinkage void smp_spurious_interrupt(void)
|
||||||
if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
|
if (v & (1 << (SPURIOUS_APIC_VECTOR & 0x1f)))
|
||||||
ack_APIC_irq();
|
ack_APIC_irq();
|
||||||
|
|
||||||
#if 0
|
|
||||||
static unsigned long last_warning;
|
|
||||||
static unsigned long skipped;
|
|
||||||
|
|
||||||
/* see sw-dev-man vol 3, chapter 7.4.13.5 */
|
|
||||||
if (time_before(last_warning+30*HZ,jiffies)) {
|
|
||||||
printk(KERN_INFO "spurious APIC interrupt on CPU#%d, %ld skipped.\n",
|
|
||||||
smp_processor_id(), skipped);
|
|
||||||
last_warning = jiffies;
|
|
||||||
skipped = 0;
|
|
||||||
} else {
|
|
||||||
skipped++;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
irq_exit();
|
irq_exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1173,7 +1160,7 @@ asmlinkage void smp_error_interrupt(void)
|
||||||
7: Illegal register address
|
7: Illegal register address
|
||||||
*/
|
*/
|
||||||
printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
|
printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
|
||||||
smp_processor_id(), v , v1);
|
smp_processor_id(), v , v1);
|
||||||
irq_exit();
|
irq_exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue