Mailing List Archive

Remove #ifdefs where the only difference is formatting of comments.

Signed-off-by: Pavel Machek <pavel@suse.cz>

---
commit 800e1add46a2686995af98432a7971150318676d
tree 5daa71306ceb60b0fb7e5707ec4d9701c06197de
parent 06f12eb6da33da70dbdccbee5a687d5353782e1d
author Pavel <pavel@amd.ucw.cz> Wed, 21 May 2008 11:52:11 +0200
committer Pavel <pavel@amd.ucw.cz> Wed, 21 May 2008 11:52:11 +0200

arch/x86/kernel/i8259.c | 20 +++-----------------
1 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 8b7eb0c..433e49e 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);

--
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/