diff options
Diffstat (limited to 'arch/x86/kernel/i8259_64.c')
-rw-r--r-- | arch/x86/kernel/i8259_64.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/x86/kernel/i8259_64.c b/arch/x86/kernel/i8259_64.c index 99c8406ae253..d3edb9f23f2c 100644 --- a/arch/x86/kernel/i8259_64.c +++ b/arch/x86/kernel/i8259_64.c | |||
@@ -359,25 +359,25 @@ void init_8259A(int auto_eoi) | |||
359 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ | 359 | outb(0xff, PIC_SLAVE_IMR); /* mask all of 8259A-2 */ |
360 | 360 | ||
361 | /* | 361 | /* |
362 | * outb_p - this has to work on a wide range of PC hardware. | 362 | * outb_pic - this has to work on a wide range of PC hardware. |
363 | */ | 363 | */ |
364 | outb_p(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ | 364 | outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */ |
365 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ | 365 | /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */ |
366 | outb_p(IRQ0_VECTOR, PIC_MASTER_IMR); | 366 | outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR); |
367 | /* 8259A-1 (the master) has a slave on IR2 */ | 367 | /* 8259A-1 (the master) has a slave on IR2 */ |
368 | outb_p(0x04, PIC_MASTER_IMR); | 368 | outb_pic(0x04, PIC_MASTER_IMR); |
369 | if (auto_eoi) /* master does Auto EOI */ | 369 | if (auto_eoi) /* master does Auto EOI */ |
370 | outb_p(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); | 370 | outb_pic(MASTER_ICW4_DEFAULT | PIC_ICW4_AEOI, PIC_MASTER_IMR); |
371 | else /* master expects normal EOI */ | 371 | else /* master expects normal EOI */ |
372 | outb_p(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); | 372 | outb_pic(MASTER_ICW4_DEFAULT, PIC_MASTER_IMR); |
373 | 373 | ||
374 | outb_p(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ | 374 | outb_pic(0x11, PIC_SLAVE_CMD); /* ICW1: select 8259A-2 init */ |
375 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ | 375 | /* ICW2: 8259A-2 IR0-7 mapped to 0x38-0x3f */ |
376 | outb_p(IRQ8_VECTOR, PIC_SLAVE_IMR); | 376 | outb_pic(IRQ8_VECTOR, PIC_SLAVE_IMR); |
377 | /* 8259A-2 is a slave on master's IR2 */ | 377 | /* 8259A-2 is a slave on master's IR2 */ |
378 | outb_p(PIC_CASCADE_IR, PIC_SLAVE_IMR); | 378 | outb_pic(PIC_CASCADE_IR, PIC_SLAVE_IMR); |
379 | /* (slave's support for AEOI in flat mode is to be investigated) */ | 379 | /* (slave's support for AEOI in flat mode is to be investigated) */ |
380 | outb_p(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); | 380 | outb_pic(SLAVE_ICW4_DEFAULT, PIC_SLAVE_IMR); |
381 | 381 | ||
382 | if (auto_eoi) | 382 | if (auto_eoi) |
383 | /* | 383 | /* |