summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavel Machek <pavel@suse.cz>2008-05-21 11:52:52 +0200
committerThomas Gleixner <tglx@linutronix.de>2008-05-24 16:44:26 +0200
commit3e8631d27088f394b6788829e238a60bf07d47ab (patch)
tree1d1f6a90ca6657779dc2625be37d80862cf7c6ca
parent15d613cb25efd978dd55592d011a6ffc487b3432 (diff)
x86: i8259.c: remove trivial ifdefs
Remove #ifdefs where the only difference is formatting of comments. Signed-off-by: Pavel Machek <pavel@suse.cz> Cc: macro@ds2.pg.gda.pl Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/x86/kernel/i8259.c20
1 files changed, 3 insertions, 17 deletions
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 8b7eb0cb2e7e..433e49edfd4f 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -175,24 +175,14 @@ handle_real_irq:
if (irq & 8) {
inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */
outb(cached_slave_mask, PIC_SLAVE_IMR);
-#ifndef CONFIG_X86_64
- outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */
- outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */
-#else /* CONFIG_X86_64 */
/* 'Specific EOI' to slave */
- outb(0x60+(irq&7),PIC_SLAVE_CMD);
+ outb(0x60+(irq&7), PIC_SLAVE_CMD);
/* 'Specific EOI' to master-IRQ2 */
- outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD);
-#endif /* CONFIG_X86_64 */
+ outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD);
} else {
inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */
outb(cached_master_mask, PIC_MASTER_IMR);
-#ifndef CONFIG_X86_64
- outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */
-#else /* CONFIG_X86_64 */
- /* 'Specific EOI' to master */
- outb(0x60+irq,PIC_MASTER_CMD);
-#endif /* CONFIG_X86_64 */
+ outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */
}
spin_unlock_irqrestore(&i8259A_lock, flags);
return;
@@ -215,12 +205,8 @@ spurious_8259A_irq:
* lets ACK and report it. [once per IRQ]
*/
if (!(spurious_irq_mask & irqmask)) {
-#ifndef CONFIG_X86_64
- printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq);
-#else /* CONFIG_X86_64 */
printk(KERN_DEBUG
"spurious 8259A interrupt: IRQ%d.\n", irq);
-#endif /* CONFIG_X86_64 */
spurious_irq_mask |= irqmask;
}
atomic_inc(&irq_err_count);