diff options
author | Pavel Machek <pavel@suse.cz> | 2008-05-21 05:52:52 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-24 10:44:26 -0400 |
commit | 3e8631d27088f394b6788829e238a60bf07d47ab (patch) | |
tree | 1d1f6a90ca6657779dc2625be37d80862cf7c6ca /arch/x86/kernel/i8259.c | |
parent | 15d613cb25efd978dd55592d011a6ffc487b3432 (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>
Diffstat (limited to 'arch/x86/kernel/i8259.c')
-rw-r--r-- | 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 8b7eb0cb2e7..433e49edfd4 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c | |||
@@ -175,24 +175,14 @@ handle_real_irq: | |||
175 | if (irq & 8) { | 175 | if (irq & 8) { |
176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ | 176 | inb(PIC_SLAVE_IMR); /* DUMMY - (do we need this?) */ |
177 | outb(cached_slave_mask, PIC_SLAVE_IMR); | 177 | outb(cached_slave_mask, PIC_SLAVE_IMR); |
178 | #ifndef CONFIG_X86_64 | ||
179 | outb(0x60+(irq&7),PIC_SLAVE_CMD);/* 'Specific EOI' to slave */ | ||
180 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); /* 'Specific EOI' to master-IRQ2 */ | ||
181 | #else /* CONFIG_X86_64 */ | ||
182 | /* 'Specific EOI' to slave */ | 178 | /* 'Specific EOI' to slave */ |
183 | outb(0x60+(irq&7),PIC_SLAVE_CMD); | 179 | outb(0x60+(irq&7), PIC_SLAVE_CMD); |
184 | /* 'Specific EOI' to master-IRQ2 */ | 180 | /* 'Specific EOI' to master-IRQ2 */ |
185 | outb(0x60+PIC_CASCADE_IR,PIC_MASTER_CMD); | 181 | outb(0x60+PIC_CASCADE_IR, PIC_MASTER_CMD); |
186 | #endif /* CONFIG_X86_64 */ | ||
187 | } else { | 182 | } else { |
188 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ | 183 | inb(PIC_MASTER_IMR); /* DUMMY - (do we need this?) */ |
189 | outb(cached_master_mask, PIC_MASTER_IMR); | 184 | outb(cached_master_mask, PIC_MASTER_IMR); |
190 | #ifndef CONFIG_X86_64 | 185 | outb(0x60+irq, PIC_MASTER_CMD); /* 'Specific EOI to master */ |
191 | outb(0x60+irq,PIC_MASTER_CMD); /* 'Specific EOI to master */ | ||
192 | #else /* CONFIG_X86_64 */ | ||
193 | /* 'Specific EOI' to master */ | ||
194 | outb(0x60+irq,PIC_MASTER_CMD); | ||
195 | #endif /* CONFIG_X86_64 */ | ||
196 | } | 186 | } |
197 | spin_unlock_irqrestore(&i8259A_lock, flags); | 187 | spin_unlock_irqrestore(&i8259A_lock, flags); |
198 | return; | 188 | return; |
@@ -215,12 +205,8 @@ spurious_8259A_irq: | |||
215 | * lets ACK and report it. [once per IRQ] | 205 | * lets ACK and report it. [once per IRQ] |
216 | */ | 206 | */ |
217 | if (!(spurious_irq_mask & irqmask)) { | 207 | if (!(spurious_irq_mask & irqmask)) { |
218 | #ifndef CONFIG_X86_64 | ||
219 | printk(KERN_DEBUG "spurious 8259A interrupt: IRQ%d.\n", irq); | ||
220 | #else /* CONFIG_X86_64 */ | ||
221 | printk(KERN_DEBUG | 208 | printk(KERN_DEBUG |
222 | "spurious 8259A interrupt: IRQ%d.\n", irq); | 209 | "spurious 8259A interrupt: IRQ%d.\n", irq); |
223 | #endif /* CONFIG_X86_64 */ | ||
224 | spurious_irq_mask |= irqmask; | 210 | spurious_irq_mask |= irqmask; |
225 | } | 211 | } |
226 | atomic_inc(&irq_err_count); | 212 | atomic_inc(&irq_err_count); |