2013-09-04 01:21:32

by Yanchuan Nian

Subject: [PATCH] x86/irq: correct comment about i8259 initialization

From: Yanchuan Nian <[email protected]>

0x30-0x3f have been used for ISA interrupts on i386 since 5 years ago,
but some comments about i8259 initialization were missed to update
at the same time.

Signed-off-by: Yanchuan Nian <[email protected]>
---
arch/x86/kernel/i8259.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 9a5c460..2e977b5 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -312,8 +312,7 @@ static void init_8259A(int auto_eoi)
*/
outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */

- /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 on x86-64,
- to 0x20-0x27 on i386 */
+ /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */
outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR);

/* 8259A-1 (the master) has a slave on IR2 */
--
1.8.1.4

2013-09-04 06:13:19

by tip-bot for Vasyl Gomonovych

Subject: [tip:irq/core] x86/irq: Correct comment about i8259 initialization

Commit-ID: 7752572f18f98ee796e173334b088a1d621d2da4
Gitweb: http://git.kernel.org/tip/7752572f18f98ee796e173334b088a1d621d2da4
Author: Yanchuan Nian <[email protected]>
AuthorDate: Wed, 4 Sep 2013 09:25:24 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Wed, 4 Sep 2013 07:46:04 +0200

x86/irq: Correct comment about i8259 initialization

0x30-0x3f have been used for ISA interrupts on i386 as well
since 5 years ago, but old comments about i8259 initialization
were still referring to the old i386 usage of this port range.

Signed-off-by: Yanchuan Nian <[email protected]>
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>
---
arch/x86/kernel/i8259.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c
index 9a5c460..2e977b5 100644
--- a/arch/x86/kernel/i8259.c
+++ b/arch/x86/kernel/i8259.c
@@ -312,8 +312,7 @@ static void init_8259A(int auto_eoi)
*/
outb_pic(0x11, PIC_MASTER_CMD); /* ICW1: select 8259A-1 init */

- /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 on x86-64,
- to 0x20-0x27 on i386 */
+ /* ICW2: 8259A-1 IR0-7 mapped to 0x30-0x37 */
outb_pic(IRQ0_VECTOR, PIC_MASTER_IMR);

/* 8259A-1 (the master) has a slave on IR2 */